[PATCH 3/5] show: Convert mbox format to new self-recursive style

diff --git a/5f/f85c70f6dd4a5749aaa0a9c603e977e8f4ecce b/5f/f85c70f6dd4a5749aaa0a9c603e977e8f4ecce
new file mode 100644 (file)
index 0000000..bed722e
--- /dev/null
+++ b/5f/f85c70f6dd4a5749aaa0a9c603e977e8f4ecce
@@ -0,0 +1,160 @@
+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 289C3431FBC\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:34 -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 9myX7vb4oA1y for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Mar 2012 21:20:32 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 201DA431FBF\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:32 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-03-4f51aa1ff30f\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 08.CF.02324.F1AA15F4; Sat,  3 Mar 2012 00:20:31 -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 q235KV6t017469; \r
+       Sat, 3 Mar 2012 00:20:31 -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 q235KUhH022247\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 3 Mar 2012 00:20:31 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S3hOQ-0000h1-7Z; Sat, 03 Mar 2012 00:20:30 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/5] show: Convert mbox format to new self-recursive style\r
+Date: Sat,  3 Mar 2012 00:20:23 -0500\r
+Message-Id: <1330752025-2542-4-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+NgFtrIIsWRmVeSWpSXmKPExsUixG6nriu/KtDfYGmvtsX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CVcfDHO/aCDuGK9++fsTQwfuftYuTkkBAwkZjb2skEYYtJXLi3\r
+       nq2LkYtDSGAfo8Su+xvZQRJCAusZJU7vkodI3GOSuD/1HiOEM59R4seadkaQKjYBDYlt+5eD\r
+       2SIC0hI7785m7WLk4GAWUJP406UCEhYW8JKYPuc8M4jNIqAqMf3wLiaQEl4Be4kDzxghjlCQ\r
+       OLf6HNheTgEHiZbjx1ghbrCX+NHfyTKBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXRO9\r
+       3MwSvdSU0k2MoJDhlOTfwfjtoNIhRgEORiUe3ssvA/yFWBPLiitzDzFKcjApifKWLw/0F+JL\r
+       yk+pzEgszogvKs1JLT7EKMHBrCTCu8wTKMebklhZlVqUD5OS5mBREudV03rnJySQnliSmp2a\r
+       WpBaBJOV4eBQkuCNWgnUKFiUmp5akZaZU4KQZuLgBBnOAzTcA6SGt7ggMbc4Mx0if4pRUUqc\r
+       VwskIQCSyCjNg+uFxfQrRnGgV4R5A0CqeIDpAK77FdBgJqDBiy/7gQwuSURISTUwTtgsI/rV\r
+       btsNG9XHt4qCGsJCCw/Pnjw11TeYMSY8I/+dWG7+K7U37zl/+JV3l3/vb/p8cI0ER2Abezv3\r
+       E/dFXxpOPfLf73Bzlkd35u8Q06aJ/wNvtKV86N9utio28O4ql9vfjrE8ehKkoTjtYMG9JbL9\r
+       4tWby5+JaLU7hS9WVKj1sToQsvCFEktxRqKhFnNRcSIATQ3538QCAAA=\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:34 -0000\r
+\r
+Given the lack of recursion, this is pretty easy.\r
+---\r
+ notmuch-show.c |   40 ++++++++++++++++++----------------------\r
+ 1 files changed, 18 insertions(+), 22 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index b3a4550..72c141e 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -45,25 +45,15 @@ static const notmuch_show_format_t format_json = {\r
+     .message_set_end = "]"\r
+ };\r
+ \r
+-static void\r
+-format_message_mbox (const void *ctx,\r
+-                   notmuch_message_t *message,\r
+-                   unused (int indent));\r
++static notmuch_status_t\r
++format_part_mbox (const void *ctx, mime_node_t *node,\r
++                int indent, const notmuch_show_params_t *params);\r
+ \r
+ static const notmuch_show_format_t format_mbox = {\r
+-    "", NULL,\r
+-        "", format_message_mbox,\r
+-            "", NULL, NULL, "",\r
+-            "",\r
+-                NULL,\r
+-                NULL,\r
+-                NULL,\r
+-                NULL,\r
+-                NULL,\r
+-                "",\r
+-            "",\r
+-        "", "",\r
+-    ""\r
++    .message_set_start = "",\r
++    .part = format_part_mbox,\r
++    .message_set_sep = "",\r
++    .message_set_end = ""\r
+ };\r
+ \r
+ static void\r
+@@ -717,11 +707,12 @@ format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent),\r
+  *\r
+  * http://qmail.org/qmail-manual-html/man5/mbox.html\r
+  */\r
+-static void\r
+-format_message_mbox (const void *ctx,\r
+-                   notmuch_message_t *message,\r
+-                   unused (int indent))\r
++static notmuch_status_t\r
++format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),\r
++                unused (const notmuch_show_params_t *params))\r
+ {\r
++    notmuch_message_t *message = node->envelope_file;\r
++\r
+     const char *filename;\r
+     FILE *file;\r
+     const char *from;\r
+@@ -734,12 +725,15 @@ format_message_mbox (const void *ctx,\r
+     size_t line_size;\r
+     ssize_t line_len;\r
+ \r
++    if (!message)\r
++      INTERNAL_ERROR ("format_part_mbox requires a root part");\r
++\r
+     filename = notmuch_message_get_filename (message);\r
+     file = fopen (filename, "r");\r
+     if (file == NULL) {\r
+       fprintf (stderr, "Failed to open %s: %s\n",\r
+                filename, strerror (errno));\r
+-      return;\r
++      return NOTMUCH_STATUS_FILE_ERROR;\r
+     }\r
+ \r
+     from = notmuch_message_get_header (message, "from");\r
+@@ -760,6 +754,8 @@ format_message_mbox (const void *ctx,\r
+     printf ("\n");\r
+ \r
+     fclose (file);\r
++\r
++    return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
+ static notmuch_status_t\r
+-- \r
+1.7.7.3\r
+\r