notmuch show: Don't hide text parts, even with disposition attachment.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index d734de39c1da5be3b91b214d05d72b7e76ea9f3c..e4de4743ec1a03227242da8f99cd50861c93ad44 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -78,7 +78,7 @@ address_is_users (const char *address, notmuch_config_t *config)
 {
     const char *primary;
     char **other;
-    unsigned int i, other_len;
+    size_t i, other_len;
 
     primary = notmuch_config_get_user_primary_email (config);
     if (strcmp (primary, address) == 0)
@@ -196,16 +196,21 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     if (config == NULL)
        return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
-    if (notmuch == NULL)
-       return 1;
-
     query_string = query_string_from_args (ctx, argc, argv);
     if (query_string == NULL) {
        fprintf (stderr, "Out of memory\n");
        return 1;
     }
 
+    if (*query_string == '\0') {
+       fprintf (stderr, "Error: notmuch reply requires at least one search term.\n");
+       return 1;
+    }
+
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+    if (notmuch == NULL)
+       return 1;
+
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
@@ -236,7 +241,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 
            recipients = notmuch_message_get_header (message,
                                                     reply_to_map[i].header);
-           if (recipients == NULL && reply_to_map[i].fallback)
+           if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback)
                recipients = notmuch_message_get_header (message,
                                                         reply_to_map[i].fallback);