[PATCH 2/5] show: Move format_message_mbox with the other new-style formats

diff --git a/13/8e193d02fabd71187e6c95e2fe2d23ee545d6b b/13/8e193d02fabd71187e6c95e2fe2d23ee545d6b
new file mode 100644 (file)
index 0000000..671ecc6
--- /dev/null
+++ b/13/8e193d02fabd71187e6c95e2fe2d23ee545d6b
@@ -0,0 +1,199 @@
+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 79460431FC7\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:33 -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 Cr1raQch2hDa for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Mar 2012 21:20:32 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 099AD431FBC\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 21:20:31 -0800 (PST)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-62-4f51aa1fa178\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 0C.09.02272.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 q235KUKS017467; \r
+       Sat, 3 Mar 2012 00:20:30 -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 q235KTYJ022244\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 3 Mar 2012 00:20:30 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S3hOP-0000gy-DF; Sat, 03 Mar 2012 00:20:29 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] show: Move format_message_mbox with the other new-style\r
+       formats\r
+Date: Sat,  3 Mar 2012 00:20:22 -0500\r
+Message-Id: <1330752025-2542-3-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/KtDf4M93RYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr49Gsj4wF5yUqJq49ydrA+Eioi5GTQ0LARGLnmj+MELaYxIV7\r
+       69lAbCGBfYwSu6fUdzFyAdnrGSUOnz3MDOHcY5LoXnKPHcKZzyhx/MAbVpAWNgENiW37l4ON\r
+       EhGQlth5dzZQnIODWUBN4k+XCogpLBAi0fQLbAGLgKrEnud3WEBsXgF7iZMXeqCOUJA4t/oc\r
+       O4jNKeAg0XL8GCvEQfYSP/o7WSYw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka6GXm1mi\r
+       l5pSuokRHDIuqjsYJxxSOsQowMGoxMNb+TzAX4g1say4MvcQoyQHk5Iob/nyQH8hvqT8lMqM\r
+       xOKM+KLSnNTiQ4wSHMxKIrzLPIFyvCmJlVWpRfkwKWkOFiVxXk2td35CAumJJanZqakFqUUw\r
+       WRkODiUJ3qiVQI2CRanpqRVpmTklCGkmDk6Q4TxAw1tBaniLCxJzizPTIfKnGBWlxHlzQRIC\r
+       IImM0jy4XlhMv2IUB3pFmDcApIoHmA7gul8BDWYCGrz4sh/I4JJEhJRUA+NcwVK92x/WPlYU\r
+       YYpcmrLyU9L7HJNDrgYSAu92zqj696KUVaSUfYfa53Lx0uvK3trHFybdq1trtV+isbeYt8p9\r
+       tXHno3vHnH1iF3z4uUJD5b1+isSXjtj3rNa7Mu5LneFaKc3xbt/DQl99yWyJ12q1Xbxdb17u\r
+       ajG3dpCo3NzMsOid+reFe5RYijMSDbWYi4oTAbDtVRHEAgAA\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:33 -0000\r
+\r
+Just code motion.\r
+---\r
+ notmuch-show.c |  100 ++++++++++++++++++++++++++++----------------------------\r
+ 1 files changed, 50 insertions(+), 50 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 648f468..b3a4550 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -219,56 +219,6 @@ _is_from_line (const char *line)\r
+       return 0;\r
+ }\r
+ \r
+-/* Print a message in "mboxrd" format as documented, for example,\r
+- * here:\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
+-{\r
+-    const char *filename;\r
+-    FILE *file;\r
+-    const char *from;\r
+-\r
+-    time_t date;\r
+-    struct tm date_gmtime;\r
+-    char date_asctime[26];\r
+-\r
+-    char *line = NULL;\r
+-    size_t line_size;\r
+-    ssize_t line_len;\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
+-    }\r
+-\r
+-    from = notmuch_message_get_header (message, "from");\r
+-    from = _extract_email_address (ctx, from);\r
+-\r
+-    date = notmuch_message_get_date (message);\r
+-    gmtime_r (&date, &date_gmtime);\r
+-    asctime_r (&date_gmtime, date_asctime);\r
+-\r
+-    printf ("From %s %s", from, date_asctime);\r
+-\r
+-    while ((line_len = getline (&line, &line_size, file)) != -1 ) {\r
+-      if (_is_from_line (line))\r
+-          putchar ('>');\r
+-      printf ("%s", line);\r
+-    }\r
+-\r
+-    printf ("\n");\r
+-\r
+-    fclose (file);\r
+-}\r
+-\r
+ static void\r
+ format_headers_message_part_text (GMimeMessage *message)\r
+ {\r
+@@ -762,6 +712,56 @@ format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent),\r
+     return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
++/* Print a message in "mboxrd" format as documented, for example,\r
++ * here:\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
++{\r
++    const char *filename;\r
++    FILE *file;\r
++    const char *from;\r
++\r
++    time_t date;\r
++    struct tm date_gmtime;\r
++    char date_asctime[26];\r
++\r
++    char *line = NULL;\r
++    size_t line_size;\r
++    ssize_t line_len;\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
++    }\r
++\r
++    from = notmuch_message_get_header (message, "from");\r
++    from = _extract_email_address (ctx, from);\r
++\r
++    date = notmuch_message_get_date (message);\r
++    gmtime_r (&date, &date_gmtime);\r
++    asctime_r (&date_gmtime, date_asctime);\r
++\r
++    printf ("From %s %s", from, date_asctime);\r
++\r
++    while ((line_len = getline (&line, &line_size, file)) != -1 ) {\r
++      if (_is_from_line (line))\r
++          putchar ('>');\r
++      printf ("%s", line);\r
++    }\r
++\r
++    printf ("\n");\r
++\r
++    fclose (file);\r
++}\r
++\r
+ static notmuch_status_t\r
+ show_message (void *ctx,\r
+             const notmuch_show_format_t *format,\r
+-- \r
+1.7.7.3\r
+\r