X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=65bd356403e210c76b000a6aa6b632d298f81d78;hp=86e9b3a29b1048b3371b734097cf49477656a2ac;hb=3493ea0ed5bd20b961aafa01eeddaf8cbc49b52f;hpb=93dcc3b695e19dd36cc8f638c6e01ecbbd9a447d

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 86e9b3a2..65bd3564 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -24,11 +24,32 @@
 #include "gmime-filter-reply.h"
 
 static void
-reply_part(GMimeObject *part, int *part_count)
+reply_part_content (GMimeObject *part)
+{
+    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+    GMimeDataWrapper *wrapper;
+
+    stream_stdout = g_mime_stream_file_new (stdout);
+    if (stream_stdout) {
+	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+	stream_filter = g_mime_stream_filter_new(stream_stdout);
+    }
+    g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+			     g_mime_filter_reply_new(TRUE));
+    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+    if (wrapper && stream_filter)
+	g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+    if (stream_filter)
+	g_object_unref(stream_filter);
+    if (stream_stdout)
+	g_object_unref(stream_stdout);
+}
+
+static void
+reply_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
-    GMimeDataWrapper *wrapper;
 
     (void) part_count;
     disposition = g_mime_object_get_content_disposition (part);
@@ -38,8 +59,17 @@ reply_part(GMimeObject *part, int *part_count)
 	const char *filename = g_mime_part_get_filename (GMIME_PART (part));
 	content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
 
-	printf ("Attachment: %s (%s)\n", filename,
-		g_mime_content_type_to_string (content_type));
+	if (g_mime_content_type_is_type (content_type, "text", "*") &&
+	    !g_mime_content_type_is_type (content_type, "text", "html"))
+	{
+	    reply_part_content (part);
+	}
+	else
+	{
+	    printf ("Attachment: %s (%s)\n", filename,
+		    g_mime_content_type_to_string (content_type));
+	}
+
 	return;
     }
 
@@ -48,21 +78,7 @@ reply_part(GMimeObject *part, int *part_count)
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
 	!g_mime_content_type_is_type (content_type, "text", "html"))
     {
-	GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
-	stream_stdout = g_mime_stream_file_new (stdout);
-	if (stream_stdout) {
-	    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
-	    stream_filter = g_mime_stream_filter_new(stream_stdout);
-	}
-	g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-				 g_mime_filter_reply_new(TRUE));
-	wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-	if (wrapper && stream_filter)
-	    g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
-	if (stream_filter)
-	    g_object_unref(stream_filter);
-	if (stream_stdout)
-	    g_object_unref(stream_stdout);
+	reply_part_content (part);
     }
     else
     {
@@ -78,15 +94,15 @@ 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)
+    if (strcasecmp (primary, address) == 0)
 	return 1;
 
     other = notmuch_config_get_user_other_email (config, &other_len);
     for (i = 0; i < other_len; i++)
-	if (strcmp (other[i], address) == 0)
+	if (strcasecmp (other[i], address) == 0)
 	    return 1;
 
     return 0;
@@ -182,12 +198,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 +212,29 @@ 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),
+				     NOTMUCH_DATABASE_MODE_READ_ONLY);
+    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, 0, -1);
+    for (messages = notmuch_query_search_messages (query);
 	 notmuch_messages_has_more (messages);
 	 notmuch_messages_advance (messages))
     {
@@ -235,6 +258,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);