[PATCH 5/5] show: Convert raw format to the new self-recursive style

Austin Clements amdragon at MIT.EDU
Fri Mar 2 21:20:25 PST 2012


This is fully compatible for root and leaf parts, but drops support
for interior parts.  Showing interior parts in raw has always been
braindead broken, so I don't think anyone will miss this.  Tests have
been updated to reflect this.

The diff looks complicated, but the change is simple.  We delete
format_headers_message_part_text, since it's no longer needed; move
the special-case code for --part=0 that used to be in do_show_single
to format_part_raw; and re-indent the code for formatting leaf parts
in format_part_raw.
---
 notmuch-show.c |  165 ++++++++++++++++++++++----------------------------------
 test/multipart |   51 ++++--------------
 2 files changed, 76 insertions(+), 140 deletions(-)

diff --git a/notmuch-show.c b/notmuch-show.c
index 6f6052c..9c2f890 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -20,9 +20,6 @@
 
 #include "notmuch-client.h"
 
-static void
-format_headers_message_part_text (GMimeMessage *message);
-
 static notmuch_status_t
 format_part_text (const void *ctx, mime_node_t *node,
 		  int indent, const notmuch_show_params_t *params);
@@ -56,23 +53,16 @@ static const notmuch_show_format_t format_mbox = {
     .message_set_end = ""
 };
 
-static void
-format_part_content_raw (GMimeObject *part);
+static notmuch_status_t
+format_part_raw (unused (const void *ctx), mime_node_t *node,
+		 unused (int indent),
+		 unused (const notmuch_show_params_t *params));
 
 static const notmuch_show_format_t format_raw = {
-    "", NULL,
-	"", NULL,
-	    "", NULL, format_headers_message_part_text, "\n",
-            "",
-                NULL,
-                NULL,
-                NULL,
-                format_part_content_raw,
-                NULL,
-                "",
-            "",
-	"", "",
-    ""
+    .message_set_start = "",
+    .part = format_part_raw,
+    .message_set_sep = "",
+    .message_set_end = ""
 };
 
 static const char *
@@ -210,27 +200,6 @@ _is_from_line (const char *line)
 }
 
 static void
-format_headers_message_part_text (GMimeMessage *message)
-{
-    InternetAddressList *recipients;
-    const char *recipients_string;
-
-    printf ("Subject: %s\n", g_mime_message_get_subject (message));
-    printf ("From: %s\n", g_mime_message_get_sender (message));
-    recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
-    recipients_string = internet_address_list_to_string (recipients, 0);
-    if (recipients_string)
-	printf ("To: %s\n",
-		recipients_string);
-    recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
-    recipients_string = internet_address_list_to_string (recipients, 0);
-    if (recipients_string)
-	printf ("Cc: %s\n",
-		recipients_string);
-    printf ("Date: %s\n", g_mime_message_get_date_as_string (message));
-}
-
-static void
 format_headers_json (const void *ctx, GMimeMessage *message)
 {
     void *local = talloc_new (ctx);
@@ -731,31 +700,70 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),
     return NOTMUCH_STATUS_SUCCESS;
 }
 
-static void
-format_part_content_raw (GMimeObject *part)
+static notmuch_status_t
+format_part_raw (unused (const void *ctx), mime_node_t *node,
+		 unused (int indent),
+		 unused (const notmuch_show_params_t *params))
 {
-    if (! GMIME_IS_PART (part))
-	return;
+    if (node->envelope_file) {
+	const char *filename;
+	FILE *file;
+	size_t size;
+	char buf[4096];
 
-    GMimeStream *stream_stdout;
-    GMimeStream *stream_filter = NULL;
-    GMimeDataWrapper *wrapper;
+	filename = notmuch_message_get_filename (node->envelope_file);
+	if (filename == NULL) {
+	    fprintf (stderr, "Error: Cannot get message filename.\n");
+	    return NOTMUCH_STATUS_FILE_ERROR;
+	}
 
-    stream_stdout = g_mime_stream_file_new (stdout);
-    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+	file = fopen (filename, "r");
+	if (file == NULL) {
+	    fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
+	    return NOTMUCH_STATUS_FILE_ERROR;
+	}
 
-    stream_filter = g_mime_stream_filter_new (stream_stdout);
+	while (!feof (file)) {
+	    size = fread (buf, 1, sizeof (buf), file);
+	    if (ferror (file)) {
+		fprintf (stderr, "Error: Read failed from %s\n", filename);
+		fclose (file);
+		return NOTMUCH_STATUS_FILE_ERROR;
+	    }
 
-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+	    if (fwrite (buf, size, 1, stdout) != 1) {
+		fprintf (stderr, "Error: Write failed\n");
+		fclose (file);
+		return NOTMUCH_STATUS_FILE_ERROR;
+	    }
+	}
 
-    if (wrapper && stream_filter)
-	g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+	fclose (file);
+    } else if (GMIME_IS_PART (node->part)) {
+	GMimeStream *stream_stdout;
+	GMimeStream *stream_filter = NULL;
+	GMimeDataWrapper *wrapper;
 
-    if (stream_filter)
-	g_object_unref (stream_filter);
+	stream_stdout = g_mime_stream_file_new (stdout);
+	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
 
-    if (stream_stdout)
-	g_object_unref(stream_stdout);
+	stream_filter = g_mime_stream_filter_new (stream_stdout);
+
+	wrapper = g_mime_part_get_content_object (GMIME_PART (node->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);
+    } else {
+	fprintf (stderr, "Error: Raw only supports root and leaf parts\n");
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+    return NOTMUCH_STATUS_SUCCESS;
 }
 
 static notmuch_status_t
@@ -891,50 +899,7 @@ do_show_single (void *ctx,
 
     notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);
 
-    /* Special case for --format=raw of full single message, just cat out file */
-    if (params->raw && 0 == params->part) {
-
-	const char *filename;
-	FILE *file;
-	size_t size;
-	char buf[4096];
-
-	filename = notmuch_message_get_filename (message);
-	if (filename == NULL) {
-	    fprintf (stderr, "Error: Cannot message filename.\n");
-	    return 1;
-	}
-
-	file = fopen (filename, "r");
-	if (file == NULL) {
-	    fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
-	    return 1;
-	}
-
-	while (!feof (file)) {
-	    size = fread (buf, 1, sizeof (buf), file);
-	    if (ferror (file)) {
-		fprintf (stderr, "Error: Read failed from %s\n", filename);
-		fclose (file);
-		return 1;
-	    }
-
-	    if (fwrite (buf, size, 1, stdout) != 1) {
-		fprintf (stderr, "Error: Write failed\n");
-		fclose (file);
-		return 1;
-	    }
-	}
-
-	fclose (file);
-
-	return 0;
-
-    } else {
-
-	return show_message (ctx, format, message, 0, params) != NOTMUCH_STATUS_SUCCESS;
-
-    }
+    return show_message (ctx, format, message, 0, params) != NOTMUCH_STATUS_SUCCESS;
 }
 
 /* Formatted output of threads */
diff --git a/test/multipart b/test/multipart
index a3036b4..cb16b43 100755
--- a/test/multipart
+++ b/test/multipart
@@ -448,59 +448,30 @@ notmuch show --format=raw --part=0 'id:87liy5ap00.fsf at yoom.home.cworth.org' >OUT
 test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
 
 test_begin_subtest "--format=raw --part=1, message body"
-notmuch show --format=raw --part=1 'id:87liy5ap00.fsf at yoom.home.cworth.org' >OUTPUT
-# output should *not* include newline
-echo >>OUTPUT
+notmuch show --format=raw --part=1 'id:87liy5ap00.fsf at yoom.home.cworth.org' >&OUTPUT
 cat <<EOF >EXPECTED
-Subject: html message
-From: Carl Worth <cworth at cworth.org>
-To: cworth at cworth.org
-Date: Fri, 05 Jan 2001 15:42:57 +0000
-
-<p>This is an embedded message, with a multipart/alternative part.</p>
-This is an embedded message, with a multipart/alternative part.
-This is a text attachment.
-And this message is signed.
-
--Carl
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEARECAAYFAk3SA/gACgkQ6JDdNq8qSWj0sACghqVJEQJUs3yV8zbTzhgnSIcD
-W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE
-=zkga
------END PGP SIGNATURE-----
+Error: Raw only supports root and leaf parts
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--format=raw --part=2, multipart/mixed"
-notmuch show --format=raw --part=2 'id:87liy5ap00.fsf at yoom.home.cworth.org' >OUTPUT
+notmuch show --format=raw --part=2 'id:87liy5ap00.fsf at yoom.home.cworth.org' >&OUTPUT
 cat <<EOF >EXPECTED
-Subject: html message
-From: Carl Worth <cworth at cworth.org>
-To: cworth at cworth.org
-Date: Fri, 05 Jan 2001 15:42:57 +0000
-
-<p>This is an embedded message, with a multipart/alternative part.</p>
-This is an embedded message, with a multipart/alternative part.
-This is a text attachment.
-And this message is signed.
-
--Carl
+Error: Raw only supports root and leaf parts
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--format=raw --part=3, rfc822 part"
-test_subtest_known_broken
-
-notmuch show --format=raw --part=3 'id:87liy5ap00.fsf at yoom.home.cworth.org' >OUTPUT
-test_expect_equal_file OUTPUT embedded_message
+notmuch show --format=raw --part=3 'id:87liy5ap00.fsf at yoom.home.cworth.org' >&OUTPUT
+cat <<EOF >EXPECTED
+Error: Raw only supports root and leaf parts
+EOF
+test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "--format=raw --part=4, rfc822's html part"
-notmuch show --format=raw --part=4 'id:87liy5ap00.fsf at yoom.home.cworth.org' >OUTPUT
+notmuch show --format=raw --part=4 'id:87liy5ap00.fsf at yoom.home.cworth.org' >&OUTPUT
 cat <<EOF >EXPECTED
-<p>This is an embedded message, with a multipart/alternative part.</p>
-This is an embedded message, with a multipart/alternative part.
+Error: Raw only supports root and leaf parts
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-- 
1.7.7.3



More information about the notmuch mailing list