--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2003D431FC3\r
+ for <notmuch@notmuchmail.org>; Fri, 2 Mar 2012 21:20:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id pm21u82kkZ1Q for <notmuch@notmuchmail.org>;\r
+ Fri, 2 Mar 2012 21:20:39 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id A5BB2431FCB\r
+ for <notmuch@notmuchmail.org>; Fri, 2 Mar 2012 21:20:33 -0800 (PST)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-e4-4f51aa21dc8c\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 97.77.02234.12AA15F4; Sat, 3 Mar 2012 00:20:33 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q235KWOr030588; \r
+ Sat, 3 Mar 2012 00:20:32 -0500\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q235KVc4022259\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 3 Mar 2012 00:20:32 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1S3hOR-0000h7-EZ; Sat, 03 Mar 2012 00:20:31 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/5] show: Convert raw format to the new self-recursive style\r
+Date: Sat, 3 Mar 2012 00:20:25 -0500\r
+Message-Id: <1330752025-2542-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6noqu4KtDfoH0ri8X1mzOZHRg9nq26\r
+ xRzAGMVlk5Kak1mWWqRvl8CV0XRnFUvBN9+Kv5vfMTcw/rPrYuTkkBAwkTj2eCU7hC0mceHe\r
+ erYuRi4OIYF9jBJbl99hgXDWM0rcXt7CDuHcY5LYeOQAE4Qzn1Gic9cPJpB+NgENiW37lzOC\r
+ 2CIC0hI7785m7WLk4GAWUJP406UCEhYW8JW4/mEO2DoWAVWJJzOfM4PYvAL2Eo+mT2OFOENB\r
+ 4tzqc2A1nAIOEi3Hj4HFhYBqfvR3skxg5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI10gv\r
+ N7NELzWldBMjKGw4JXl3ML47qHSIUYCDUYmH9+LLAH8h1sSy4srcQ4ySHExKorzlywP9hfiS\r
+ 8lMqMxKLM+KLSnNSiw8xSnAwK4nwLvMEyvGmJFZWpRblw6SkOViUxHlVtd75CQmkJ5akZqem\r
+ FqQWwWRlODiUJHijVgI1ChalpqdWpGXmlCCkmTg4QYbzAA33AKnhLS5IzC3OTIfIn2JUlBLn\r
+ zQVJCIAkMkrz4Hphcf2KURzoFWHeAJAqHmBKgOt+BTSYCWjw4st+IINLEhFSUg2M01VlxD2P\r
+ 7VA7IO8619/lZd+/yxbffsZabZZ5lG1p5VAYFqlQ+7J7/4WSeVIlZ92jblysijykbbhs8WJW\r
+ np4vcpxmv/deaGuRWLc02evHHK9pR9Ym8nyeKeVvNjGBrYhNMV37lFiuwv+Q4CT96LeV+bEC\r
+ gRL3dtxdWfx/luLU/MctO3/JGsgpsRRnJBpqMRcVJwIAJION5sYCAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 03 Mar 2012 05:20:43 -0000\r
+\r
+This is fully compatible for root and leaf parts, but drops support\r
+for interior parts. Showing interior parts in raw has always been\r
+braindead broken, so I don't think anyone will miss this. Tests have\r
+been updated to reflect this.\r
+\r
+The diff looks complicated, but the change is simple. We delete\r
+format_headers_message_part_text, since it's no longer needed; move\r
+the special-case code for --part=0 that used to be in do_show_single\r
+to format_part_raw; and re-indent the code for formatting leaf parts\r
+in format_part_raw.\r
+---\r
+ notmuch-show.c | 165 ++++++++++++++++++++++----------------------------------\r
+ test/multipart | 51 ++++--------------\r
+ 2 files changed, 76 insertions(+), 140 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 6f6052c..9c2f890 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -20,9 +20,6 @@\r
+ \r
+ #include "notmuch-client.h"\r
+ \r
+-static void\r
+-format_headers_message_part_text (GMimeMessage *message);\r
+-\r
+ static notmuch_status_t\r
+ format_part_text (const void *ctx, mime_node_t *node,\r
+ int indent, const notmuch_show_params_t *params);\r
+@@ -56,23 +53,16 @@ static const notmuch_show_format_t format_mbox = {\r
+ .message_set_end = ""\r
+ };\r
+ \r
+-static void\r
+-format_part_content_raw (GMimeObject *part);\r
++static notmuch_status_t\r
++format_part_raw (unused (const void *ctx), mime_node_t *node,\r
++ unused (int indent),\r
++ unused (const notmuch_show_params_t *params));\r
+ \r
+ static const notmuch_show_format_t format_raw = {\r
+- "", NULL,\r
+- "", NULL,\r
+- "", NULL, format_headers_message_part_text, "\n",\r
+- "",\r
+- NULL,\r
+- NULL,\r
+- NULL,\r
+- format_part_content_raw,\r
+- NULL,\r
+- "",\r
+- "",\r
+- "", "",\r
+- ""\r
++ .message_set_start = "",\r
++ .part = format_part_raw,\r
++ .message_set_sep = "",\r
++ .message_set_end = ""\r
+ };\r
+ \r
+ static const char *\r
+@@ -210,27 +200,6 @@ _is_from_line (const char *line)\r
+ }\r
+ \r
+ static void\r
+-format_headers_message_part_text (GMimeMessage *message)\r
+-{\r
+- InternetAddressList *recipients;\r
+- const char *recipients_string;\r
+-\r
+- printf ("Subject: %s\n", g_mime_message_get_subject (message));\r
+- printf ("From: %s\n", g_mime_message_get_sender (message));\r
+- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+- recipients_string = internet_address_list_to_string (recipients, 0);\r
+- if (recipients_string)\r
+- printf ("To: %s\n",\r
+- recipients_string);\r
+- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
+- recipients_string = internet_address_list_to_string (recipients, 0);\r
+- if (recipients_string)\r
+- printf ("Cc: %s\n",\r
+- recipients_string);\r
+- printf ("Date: %s\n", g_mime_message_get_date_as_string (message));\r
+-}\r
+-\r
+-static void\r
+ format_headers_json (const void *ctx, GMimeMessage *message)\r
+ {\r
+ void *local = talloc_new (ctx);\r
+@@ -731,31 +700,70 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),\r
+ return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
+-static void\r
+-format_part_content_raw (GMimeObject *part)\r
++static notmuch_status_t\r
++format_part_raw (unused (const void *ctx), mime_node_t *node,\r
++ unused (int indent),\r
++ unused (const notmuch_show_params_t *params))\r
+ {\r
+- if (! GMIME_IS_PART (part))\r
+- return;\r
++ if (node->envelope_file) {\r
++ const char *filename;\r
++ FILE *file;\r
++ size_t size;\r
++ char buf[4096];\r
+ \r
+- GMimeStream *stream_stdout;\r
+- GMimeStream *stream_filter = NULL;\r
+- GMimeDataWrapper *wrapper;\r
++ filename = notmuch_message_get_filename (node->envelope_file);\r
++ if (filename == NULL) {\r
++ fprintf (stderr, "Error: Cannot get message filename.\n");\r
++ return NOTMUCH_STATUS_FILE_ERROR;\r
++ }\r
+ \r
+- stream_stdout = g_mime_stream_file_new (stdout);\r
+- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
++ file = fopen (filename, "r");\r
++ if (file == NULL) {\r
++ fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));\r
++ return NOTMUCH_STATUS_FILE_ERROR;\r
++ }\r
+ \r
+- stream_filter = g_mime_stream_filter_new (stream_stdout);\r
++ while (!feof (file)) {\r
++ size = fread (buf, 1, sizeof (buf), file);\r
++ if (ferror (file)) {\r
++ fprintf (stderr, "Error: Read failed from %s\n", filename);\r
++ fclose (file);\r
++ return NOTMUCH_STATUS_FILE_ERROR;\r
++ }\r
+ \r
+- wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
++ if (fwrite (buf, size, 1, stdout) != 1) {\r
++ fprintf (stderr, "Error: Write failed\n");\r
++ fclose (file);\r
++ return NOTMUCH_STATUS_FILE_ERROR;\r
++ }\r
++ }\r
+ \r
+- if (wrapper && stream_filter)\r
+- g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
++ fclose (file);\r
++ } else if (GMIME_IS_PART (node->part)) {\r
++ GMimeStream *stream_stdout;\r
++ GMimeStream *stream_filter = NULL;\r
++ GMimeDataWrapper *wrapper;\r
+ \r
+- if (stream_filter)\r
+- g_object_unref (stream_filter);\r
++ stream_stdout = g_mime_stream_file_new (stdout);\r
++ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+ \r
+- if (stream_stdout)\r
+- g_object_unref(stream_stdout);\r
++ stream_filter = g_mime_stream_filter_new (stream_stdout);\r
++\r
++ wrapper = g_mime_part_get_content_object (GMIME_PART (node->part));\r
++\r
++ if (wrapper && stream_filter)\r
++ g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
++\r
++ if (stream_filter)\r
++ g_object_unref (stream_filter);\r
++\r
++ if (stream_stdout)\r
++ g_object_unref(stream_stdout);\r
++ } else {\r
++ fprintf (stderr, "Error: Raw only supports root and leaf parts\n");\r
++ return NOTMUCH_STATUS_FILE_ERROR;\r
++ }\r
++ return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
+ static notmuch_status_t\r
+@@ -891,50 +899,7 @@ do_show_single (void *ctx,\r
+ \r
+ notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);\r
+ \r
+- /* Special case for --format=raw of full single message, just cat out file */\r
+- if (params->raw && 0 == params->part) {\r
+-\r
+- const char *filename;\r
+- FILE *file;\r
+- size_t size;\r
+- char buf[4096];\r
+-\r
+- filename = notmuch_message_get_filename (message);\r
+- if (filename == NULL) {\r
+- fprintf (stderr, "Error: Cannot message filename.\n");\r
+- return 1;\r
+- }\r
+-\r
+- file = fopen (filename, "r");\r
+- if (file == NULL) {\r
+- fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));\r
+- return 1;\r
+- }\r
+-\r
+- while (!feof (file)) {\r
+- size = fread (buf, 1, sizeof (buf), file);\r
+- if (ferror (file)) {\r
+- fprintf (stderr, "Error: Read failed from %s\n", filename);\r
+- fclose (file);\r
+- return 1;\r
+- }\r
+-\r
+- if (fwrite (buf, size, 1, stdout) != 1) {\r
+- fprintf (stderr, "Error: Write failed\n");\r
+- fclose (file);\r
+- return 1;\r
+- }\r
+- }\r
+-\r
+- fclose (file);\r
+-\r
+- return 0;\r
+-\r
+- } else {\r
+-\r
+- return show_message (ctx, format, message, 0, params) != NOTMUCH_STATUS_SUCCESS;\r
+-\r
+- }\r
++ return show_message (ctx, format, message, 0, params) != NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
+ /* Formatted output of threads */\r
+diff --git a/test/multipart b/test/multipart\r
+index a3036b4..cb16b43 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -448,59 +448,30 @@ notmuch show --format=raw --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUT\r
+ test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart\r
+ \r
+ test_begin_subtest "--format=raw --part=1, message body"\r
+-notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+-# output should *not* include newline\r
+-echo >>OUTPUT\r
++notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >&OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-Subject: html message\r
+-From: Carl Worth <cworth@cworth.org>\r
+-To: cworth@cworth.org\r
+-Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+-\r
+-<p>This is an embedded message, with a multipart/alternative part.</p>\r
+-This is an embedded message, with a multipart/alternative part.\r
+-This is a text attachment.\r
+-And this message is signed.\r
+-\r
+--Carl\r
+------BEGIN PGP SIGNATURE-----\r
+-Version: GnuPG v1.4.11 (GNU/Linux)\r
+-\r
+-iEYEARECAAYFAk3SA/gACgkQ6JDdNq8qSWj0sACghqVJEQJUs3yV8zbTzhgnSIcD\r
+-W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE\r
+-=zkga\r
+------END PGP SIGNATURE-----\r
++Error: Raw only supports root and leaf parts\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--format=raw --part=2, multipart/mixed"\r
+-notmuch show --format=raw --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
++notmuch show --format=raw --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org' >&OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-Subject: html message\r
+-From: Carl Worth <cworth@cworth.org>\r
+-To: cworth@cworth.org\r
+-Date: Fri, 05 Jan 2001 15:42:57 +0000\r
+-\r
+-<p>This is an embedded message, with a multipart/alternative part.</p>\r
+-This is an embedded message, with a multipart/alternative part.\r
+-This is a text attachment.\r
+-And this message is signed.\r
+-\r
+--Carl\r
++Error: Raw only supports root and leaf parts\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--format=raw --part=3, rfc822 part"\r
+-test_subtest_known_broken\r
+-\r
+-notmuch show --format=raw --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+-test_expect_equal_file OUTPUT embedded_message\r
++notmuch show --format=raw --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' >&OUTPUT\r
++cat <<EOF >EXPECTED\r
++Error: Raw only supports root and leaf parts\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--format=raw --part=4, rfc822's html part"\r
+-notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
++notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >&OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-<p>This is an embedded message, with a multipart/alternative part.</p>\r
+-This is an embedded message, with a multipart/alternative part.\r
++Error: Raw only supports root and leaf parts\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff