X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=show-message.c;h=c206bddc0371d4d6bdebbb9936b2c2531fb71aa0;hp=2d3189e33474b02e2e177827f4ab17b3459d24b3;hb=362ab047c264ae67ec3de041aec637979077db21;hpb=357aba3ec8177c11a7ce22cbe26d92482f6a5e53

diff --git a/show-message.c b/show-message.c
index 2d3189e3..c206bddc 100644
--- a/show-message.c
+++ b/show-message.c
@@ -23,26 +23,27 @@
 #include "notmuch-client.h"
 
 static void
-show_message_part (GMimeObject *part, int *part_count,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+show_message_part (GMimeObject *part,
+		   int *part_count,
+		   void (*show_part) (GMimeObject *part, int *part_count, int first),
+		   void (*show_part_end) (GMimeObject *part),
+		   int first)
 {
-    *part_count = *part_count + 1;
-
     if (GMIME_IS_MULTIPART (part)) {
 	GMimeMultipart *multipart = GMIME_MULTIPART (part);
 	int i;
 
+	*part_count = *part_count + 1;
+	(*show_part) (part, part_count, first);
+
 	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-	    if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
-		/* Don't index the signature. */
-		if (i == 1)
-		    continue;
-		if (i > 1)
-		    fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
-	    }
 	    show_message_part (g_mime_multipart_get_part (multipart, i),
-			       part_count, show_part);
+			       part_count, show_part, show_part_end, i == 0);
 	}
+
+	if (show_part_end)
+	    (*show_part_end) (part);
+
 	return;
     }
 
@@ -52,7 +53,7 @@ show_message_part (GMimeObject *part, int *part_count,
 	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
 
 	show_message_part (g_mime_message_get_mime_part (mime_message),
-			   part_count, show_part);
+			   part_count, show_part, show_part_end, first);
 
 	return;
     }
@@ -63,26 +64,25 @@ show_message_part (GMimeObject *part, int *part_count,
 	return;
     }
 
-    (*show_part) (part, part_count);
+    *part_count = *part_count + 1;
+
+    (*show_part) (part, part_count, first);
+    if (show_part_end)
+	(*show_part_end) (part);
 }
 
 notmuch_status_t
 show_message_body (const char *filename,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+		   void (*show_part) (GMimeObject *part, int *part_count, int first),
+		   void (*show_part_end) (GMimeObject *part))
 {
     GMimeStream *stream = NULL;
     GMimeParser *parser = NULL;
     GMimeMessage *mime_message = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-    static int initialized = 0;
     FILE *file = NULL;
     int part_count = 0;
 
-    if (! initialized) {
-	g_mime_init (0);
-	initialized = 1;
-    }
-
     file = fopen (filename, "r");
     if (! file) {
 	fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
@@ -98,7 +98,7 @@ show_message_body (const char *filename,
     mime_message = g_mime_parser_construct_message (parser);
 
     show_message_part (g_mime_message_get_mime_part (mime_message),
-		       &part_count, show_part);
+		       &part_count, show_part, show_part_end, TRUE);
 
   DONE:
     if (mime_message)
@@ -115,3 +115,95 @@ show_message_body (const char *filename,
 
     return ret;
 }
+
+static void
+show_one_part_output (GMimeObject *part)
+{
+    GMimeStream *stream_filter = NULL;
+    GMimeDataWrapper *wrapper;
+    GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
+
+    stream_filter = g_mime_stream_filter_new(stream_stdout);
+    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);
+}
+
+static void
+show_one_part_worker (GMimeObject *part, int *part_count, int desired_part)
+{
+    if (GMIME_IS_MULTIPART (part)) {
+	GMimeMultipart *multipart = GMIME_MULTIPART (part);
+	int i;
+
+	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+		show_one_part_worker (g_mime_multipart_get_part (multipart, i),
+				      part_count, desired_part);
+	}
+	return;
+    }
+
+    if (GMIME_IS_MESSAGE_PART (part)) {
+	GMimeMessage *mime_message;
+
+	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+
+	show_one_part_worker (g_mime_message_get_mime_part (mime_message),
+			      part_count, desired_part);
+
+	return;
+    }
+
+    if (! (GMIME_IS_PART (part)))
+	return;
+
+    *part_count = *part_count + 1;
+
+    if (*part_count == desired_part)
+	    show_one_part_output (part);
+}
+
+notmuch_status_t
+show_one_part (const char *filename, int part)
+{
+	GMimeStream *stream = NULL;
+	GMimeParser *parser = NULL;
+	GMimeMessage *mime_message = NULL;
+	notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+	FILE *file = NULL;
+	int part_count = 0;
+
+	file = fopen (filename, "r");
+	if (! file) {
+		fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
+		ret = NOTMUCH_STATUS_FILE_ERROR;
+		goto DONE;
+	}
+
+	stream = g_mime_stream_file_new (file);
+	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+
+	parser = g_mime_parser_new_with_stream (stream);
+
+	mime_message = g_mime_parser_construct_message (parser);
+
+	show_one_part_worker (g_mime_message_get_mime_part (mime_message),
+			      &part_count, part);
+
+ DONE:
+	if (mime_message)
+		g_object_unref (mime_message);
+
+	if (parser)
+		g_object_unref (parser);
+
+	if (stream)
+		g_object_unref (stream);
+
+	if (file)
+		fclose (file);
+
+	return ret;
+}