X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=d727f302d2f09324dc5dc7d30681d6dc0fb236ef;hp=7749dbc4b68ffde96b39fe81c95a993a8e708955;hb=637f99d8f3f45867d0a856503f9f302333824c07;hpb=933caf814fcbbb7420d03ef42bb37bea6dd90449

diff --git a/notmuch-show.c b/notmuch-show.c
index 7749dbc4..d727f302 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -66,12 +66,34 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
 			    from, relative_date, tags);
 }
 
+static void
+show_part_content (GMimeObject *part)
+{
+    GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
+    GMimeStream *stream_filter = NULL;
+    GMimeDataWrapper *wrapper;
+
+    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_crlf_new(FALSE, FALSE));
+    }
+
+    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
 show_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
-    GMimeDataWrapper *wrapper;
 
     disposition = g_mime_object_get_content_disposition (part);
     if (disposition &&
@@ -85,6 +107,13 @@ show_part (GMimeObject *part, int *part_count)
 		g_mime_content_type_to_string (content_type));
 	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"))
+	{
+	    show_part_content (part);
+	}
+
 	printf ("\fattachment}\n");
 
 	return;
@@ -99,14 +128,7 @@ show_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 = g_mime_stream_file_new (stdout);
-	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
-
-	wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-	if (wrapper && stream)
-	    g_mime_data_wrapper_write_to_stream (wrapper, stream);
-	if (stream)
-	    g_object_unref(stream);
+	show_part_content (part);
     }
     else
     {
@@ -187,16 +209,22 @@ notmuch_show_command (void *ctx, unused (int argc), unused (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 show 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");
@@ -211,6 +239,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 
 	messages = notmuch_thread_get_toplevel_messages (thread);
 
+	if (messages == NULL)
+	    INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
+			    notmuch_thread_get_thread_id (thread));
+
 	show_messages (ctx, messages, 0);
 
 	notmuch_thread_destroy (thread);