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

diff --git a/6c/34639decd0e872da02aaa976fcf0d02bd7f777 b/6c/34639decd0e872da02aaa976fcf0d02bd7f777
new file mode 100644 (file)
index 0000000..433268f
--- /dev/null
+++ b/6c/34639decd0e872da02aaa976fcf0d02bd7f777
@@ -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 951E9429E29\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:56 -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 uOy6m6sqRnGl 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 4DAC0431FD4\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-54-4f565c13afc6\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 06.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-2.mit.edu (8.13.8/8.9.2) with ESMTP id q26ImpUK023814; \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 q26Immga016465\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 6 Mar 2012 13:48:50 -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-0003pS-A7; Tue, 06 Mar 2012 18:48:48 +0000\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/8] show: Convert mbox format to new self-recursive style\r
+Date: Tue,  6 Mar 2012 18:48:41 +0000\r
+Message-Id: <1331059724-14653-6-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+NgFtrFIsWRmVeSWpSXmKPExsUixG6noiscE+Zv8G27pcWefV4W12/OZHZg\r
+       8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZB3+8Yy/oEK54//4ZSwPjd94uRk4OCQETidae\r
+       /2wQtpjEhXvrgWwuDiGBfYwSf+/NYYZw1jNKzNg/gQnCOcgkMfXtdhaQFiGB+YwSvy6Jgths\r
+       AhoS2/YvZwSxRQSkJXbenc3axcjBwSzgJNHW5gUSFhbwlWhrfQBWwiKgKrH/3j2wMbwCDhLb\r
+       Ds6CukJB4tzqc+wgNqeAo8Sep5sYIVaVSVy6eYFlAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ\r
+       eXmpRbrGermZJXqpKaWbGEFBxCnJt4Px60GlQ4wCHIxKPLwX9cP8hVgTy4orcw8xSnIwKYny\r
+       5kQBhfiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwfnsf6i/Em5JYWZValA+TkuZgURLnVdN65yck\r
+       kJ5YkpqdmlqQWgSTleHgUJLgzYgGGipYlJqeWpGWmVOCkGbi4AQZzgM03Aikhre4IDG3ODMd\r
+       In+KUVFKnNcPJCEAksgozYPrhUX5K0ZxoFeEeR1BqniACQKu+xXQYCagwW3KwSCDSxIRUlIN\r
+       jPVX/qbp1yhu0BfpmnrhQEvP71VWLf/+f5BgyXLf6/lV13jv58wJj2ec19F+zrub6/M326rM\r
+       AyLMm4y2C8z79aAhoMt3bZX9r9n+vRWhjIdYT1XVG1VNbOEsdv7hUVW4ck/b517XlidmRsuf\r
+       6/OxR8hLpLJkNVjG//9ooeuUFsF96uW9MJlXSizFGYmGWsxFxYkAKEq4os0CAAA=\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:57 -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