X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=e4de4743ec1a03227242da8f99cd50861c93ad44;hp=d2fc6d9213c32b6cb6711c32795b12534a7d62fb;hb=f52528a344aee5111f6356f50678dfd54d5d80f6;hpb=8f9bd26e6237a766499bcfc6cbdcad88d4e159b4

diff --git a/notmuch-reply.c b/notmuch-reply.c
index d2fc6d92..e4de4743 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -24,7 +24,7 @@
 #include "gmime-filter-reply.h"
 
 static void
-reply_part(GMimeObject *part, int *part_count)
+reply_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
@@ -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)
@@ -182,12 +182,13 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     char *reply_headers;
     struct {
 	const char *header;
+	const char *fallback;
 	GMimeRecipientType recipient_type;
     } reply_to_map[] = {
-	{ "from", GMIME_RECIPIENT_TYPE_TO  },
-	{ "to",   GMIME_RECIPIENT_TYPE_TO  },
-	{ "cc",   GMIME_RECIPIENT_TYPE_CC  },
-	{ "bcc",  GMIME_RECIPIENT_TYPE_BCC }
+	{ "reply-to", "from", GMIME_RECIPIENT_TYPE_TO  },
+	{ "to",         NULL, GMIME_RECIPIENT_TYPE_TO  },
+	{ "cc",         NULL, GMIME_RECIPIENT_TYPE_CC  },
+	{ "bcc",        NULL, GMIME_RECIPIENT_TYPE_BCC }
     };
     unsigned int i;
 
@@ -195,23 +196,28 @@ 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");
 	return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query);
+    for (messages = notmuch_query_search_messages (query, 0, -1);
 	 notmuch_messages_has_more (messages);
 	 notmuch_messages_advance (messages))
     {
@@ -235,6 +241,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 
 	    recipients = notmuch_message_get_header (message,
 						     reply_to_map[i].header);
+	    if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback)
+		recipients = notmuch_message_get_header (message,
+							 reply_to_map[i].fallback);
+
 	    addr = add_recipients_for_string (reply, config,
 					      reply_to_map[i].recipient_type,
 					      recipients);
@@ -251,6 +261,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 	g_mime_object_set_header (GMIME_OBJECT (reply),
 				  "From", from_addr);
 
+	g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
+			   notmuch_config_get_user_primary_email (config));
+
 	in_reply_to = talloc_asprintf (ctx, "<%s>",
 			     notmuch_message_get_message_id (message));