--- /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 9A95F431FD5\r
+ for <notmuch@notmuchmail.org>; Tue, 6 Mar 2012 10:48:58 -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 qTHbuziACpFm for <notmuch@notmuchmail.org>;\r
+ Tue, 6 Mar 2012 10:48:55 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id 8E9E7431FD2\r
+ for <notmuch@notmuchmail.org>; Tue, 6 Mar 2012 10:48:52 -0800 (PST)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-55-4f565c137a8b\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 16.70.02243.31C565F4; Tue, 6 Mar 2012 13:48:51 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26ImpKc020742; \r
+ Tue, 6 Mar 2012 13:48:51 -0500\r
+Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
+ (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 q26ImmPx016468\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 6 Mar 2012 13:48:51 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1S4zRI-0003pY-Ib; Tue, 06 Mar 2012 18:48:48 +0000\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 7/8] show: Convert raw format to the new self-recursive\r
+ style, properly support interior parts\r
+Date: Tue, 6 Mar 2012 18:48:43 +0000\r
+Message-Id: <1331059724-14653-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+ <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsUixG6nriscE+ZvcKTF0mLPPi+L6zdnMjsw\r
+ edw9zeXxbNUt5gCmKC6blNSczLLUIn27BK6MJfsXMRbcCa+40/ORuYFxq1sXIyeHhICJxLIF\r
+ 91ghbDGJC/fWs3UxcnEICexjlFh+4DaUs55RYk//PkaQKiGBg0wSqydZQ9jzGSX+vBEGsdkE\r
+ NCS27V8OViMiIC2x8+5soKkcHMwCThJtbV4gYWGBQonz/7eyg9gsAqoSCyYcZwaxeQUcJB58\r
+ OAp1hILEudXnwGo4BRwl9jzdBLW2TOLSzQssExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtL\r
+ LdI11svNLNFLTSndxAgKIU5Jvh2MXw8qHWIU4GBU4uG9qB/mL8SaWFZcmXuIUZKDSUmUNycK\r
+ KMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmE99v7UH8h3pTEyqrUonyYlDQHi5I4r5rWOz8hgfTE\r
+ ktTs1NSC1CKYrAwHh5IEb0Y00FDBotT01Iq0zJwShDQTByfIcB6g4UYgNbzFBYm5xZnpEPlT\r
+ jIpS4rx+IAkBkERGaR5cLyzGXzGKA70izOsIUsUDTA9w3a+ABjMBDW5TDgYZXJKIkJJqYFwt\r
+ x/I65cfeLPEthSxTfrysmPp6p0Y3+4yCtUc5rI8W7256KWn/yC/JL8k16mLOSkadLSdTi7fU\r
+ ndjcc2WKGZvng6yCoxM95xn8l5xc5a/lPosvNmgHi//9PvltOzc6SPhVGfybkX4651TRRuGb\r
+ FSf9DCeebgha8mE5N9OZaSav02oeZ5vdeKLEUpyRaKjFXFScCAA64X1LzAIAAA==\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: Tue, 06 Mar 2012 18:48:59 -0000\r
+\r
+This is fully compatible for root and leaf parts, but now has proper\r
+support for interior parts. This requires some design decisions that\r
+were guided by what I would want if I were to save a part.\r
+Specifically:\r
+\r
+- Leaf parts are printed without headers and with transfer decoding.\r
+ This is what makes sense for saving attachments. (Furthermore, the\r
+ transfer decoding is necessary since, without the headers, the\r
+ caller would not be able to interpret non-transfer-decoded output.)\r
+\r
+- Message parts are printed with their message headers, but without\r
+ enclosing part headers. This is what makes sense for saving a\r
+ message as a whole (which is a message part) and for saving attached\r
+ messages. This is symmetric for whole messages and for attached\r
+ messages, though we special-case the whole message for performance\r
+ reasons (and corner-case correctness reasons: given malformed input,\r
+ GMime may not be able to reproduce it from the parsed\r
+ representation).\r
+\r
+- Multipart parts are printed with their headers and all child parts.\r
+ It's not clear what the best thing to do for multipart is, but this\r
+ was the most natural to implement and can be justified because such\r
+ parts can't be interpreted without their headers.\r
+\r
+As an added benefit, we can move the special-case code for part 0 into\r
+the raw formatter.\r
+---\r
+ notmuch-show.c | 159 ++++++++++++++++++++++++--------------------------------\r
+ test/multipart | 74 +++++++++++++++++---------\r
+ 2 files changed, 116 insertions(+), 117 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 6f6052c..8ed6896 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,82 @@ 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
++ /* Special case the entire message to avoid MIME parsing. */\r
++ const char *filename;\r
++ FILE *file;\r
++ size_t size;\r
++ char buf[4096];\r
++\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
++ 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
++ 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
++ 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
++ fclose (file);\r
++ return NOTMUCH_STATUS_SUCCESS;\r
++ }\r
+ \r
+ GMimeStream *stream_stdout;\r
+ GMimeStream *stream_filter = NULL;\r
+- GMimeDataWrapper *wrapper;\r
+ \r
+ stream_stdout = g_mime_stream_file_new (stdout);\r
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+ \r
+ stream_filter = g_mime_stream_filter_new (stream_stdout);\r
+ \r
+- wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
++ if (GMIME_IS_PART (node->part)) {\r
++ /* For leaf parts, we emit only the transfer-decoded\r
++ * body. */\r
++ GMimeDataWrapper *wrapper;\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
++ if (wrapper && stream_filter)\r
++ g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
++ } else {\r
++ /* Write out the whole part. For message parts (the root\r
++ * part and embedded message parts), this will be the\r
++ * message including its headers (but not the\r
++ * encapsulating part's headers). For multipart parts,\r
++ * this will include the headers. */\r
++ if (stream_filter)\r
++ g_mime_object_write_to_stream (node->part, stream_filter);\r
++ }\r
+ \r
+ if (stream_filter)\r
+ g_object_unref (stream_filter);\r
+ \r
+ if (stream_stdout)\r
+ g_object_unref(stream_stdout);\r
++\r
++ return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
+ static notmuch_status_t\r
+@@ -891,50 +911,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 475c6a2..c1a5702 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -450,58 +450,80 @@ 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
+-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
+-EOF\r
+-test_expect_equal_file OUTPUT EXPECTED\r
++test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart\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
+ cat <<EOF >EXPECTED\r
+-Subject: html message\r
++Content-Type: multipart/mixed; boundary="=-=-="\r
++\r
++--=-=-=\r
++Content-Type: message/rfc822\r
++Content-Disposition: inline\r
++\r
+ From: Carl Worth <cworth@cworth.org>\r
+ To: cworth@cworth.org\r
++Subject: html message\r
+ Date: Fri, 05 Jan 2001 15:42:57 +0000\r
++User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)\r
++Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org>\r
++MIME-Version: 1.0\r
++Content-Type: multipart/alternative; boundary="==-=-=="\r
++\r
++--==-=-==\r
++Content-Type: text/html\r
+ \r
+ <p>This is an embedded message, with a multipart/alternative part.</p>\r
++\r
++--==-=-==\r
++Content-Type: text/plain\r
++\r
+ This is an embedded message, with a multipart/alternative part.\r
++\r
++--==-=-==--\r
++\r
++--=-=-=\r
++Content-Disposition: attachment; filename=attachment\r
++\r
+ This is a text attachment.\r
++\r
++--=-=-=\r
++\r
+ And this message is signed.\r
+ \r
+ -Carl\r
++\r
++--=-=-=--\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
+ \r
+ test_begin_subtest "--format=raw --part=4, rfc822's multipart"\r
+ notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
++From: Carl Worth <cworth@cworth.org>\r
++To: cworth@cworth.org\r
++Subject: html message\r
++Date: Fri, 05 Jan 2001 15:42:57 +0000\r
++User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)\r
++Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org>\r
++MIME-Version: 1.0\r
++Content-Type: multipart/alternative; boundary="==-=-=="\r
++\r
++--==-=-==\r
++Content-Type: text/html\r
++\r
+ <p>This is an embedded message, with a multipart/alternative part.</p>\r
++\r
++--==-=-==\r
++Content-Type: text/plain\r
++\r
+ This is an embedded message, with a multipart/alternative part.\r
++\r
++--==-=-==--\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff