From 8317eef50edb0df5b3842d16a7dc7855fc0eabaa Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 6 Mar 2012 18:48:40 +0000 Subject: [PATCH] [PATCH v2 4/8] show: Move format_message_mbox with the other new-style formats --- bf/ecb6ab2dd293b27df2c50c674435fe9e711609 | 199 ++++++++++++++++++++++ 1 file changed, 199 insertions(+) create mode 100644 bf/ecb6ab2dd293b27df2c50c674435fe9e711609 diff --git a/bf/ecb6ab2dd293b27df2c50c674435fe9e711609 b/bf/ecb6ab2dd293b27df2c50c674435fe9e711609 new file mode 100644 index 000000000..84d4ba463 --- /dev/null +++ b/bf/ecb6ab2dd293b27df2c50c674435fe9e711609 @@ -0,0 +1,199 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B9A1431FD5 + for ; Tue, 6 Mar 2012 10:48:53 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id leY1jjpNVReI for ; + Tue, 6 Mar 2012 10:48:51 -0800 (PST) +Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU + [18.7.68.35]) + by olra.theworths.org (Postfix) with ESMTP id C0A12431FCF + for ; Tue, 6 Mar 2012 10:48:51 -0800 (PST) +X-AuditID: 12074423-b7f9c6d0000008c3-e4-4f565c139484 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP + id E2.FD.02243.31C565F4; Tue, 6 Mar 2012 13:48:51 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26ImpvM020738; + Tue, 6 Mar 2012 13:48:51 -0500 +Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26ImmXa016464 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 6 Mar 2012 13:48:50 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1S4zRI-0003pP-6I; Tue, 06 Mar 2012 18:48:48 +0000 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 4/8] show: Move format_message_mbox with the other + new-style formats +Date: Tue, 6 Mar 2012 18:48:40 +0000 +Message-Id: <1331059724-14653-5-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu> +References: <1330752025-2542-1-git-send-email-amdragon@mit.edu> + <1331059724-14653-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6nriscE+ZvcGmnpMWefV4W12/OZHZg + 8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZj2Z9ZCw4L1Exce1J1gbGR0JdjJwcEgImEg9P + NbFD2GISF+6tZ+ti5OIQEtjHKHHt5nsoZz2jxMQl09ghnINMEp2/1zFBOPMZJdYf+8MI0s8m + oCGxbf9yMFtEQFpi593ZrF2MHBzMAk4SbW1eIKawQLjEuR81IBUsAqoStyeAVHBy8Ao4SDSc + OM0CcYWCxLnV58Au4hRwlNjzdBPYRCGBMolLNy+wTGDkX8DIsIpRNiW3Sjc3MTOnODVZtzg5 + MS8vtUjXTC83s0QvNaV0EyM4iFyUdzD+Oah0iFGAg1GJh7dKN8xfiDWxrLgy9xCjJAeTkihv + ThRQiC8pP6UyI7E4I76oNCe1+BCjBAezkgjvt/eh/kK8KYmVValF+TApaQ4WJXFeDa13fkIC + 6YklqdmpqQWpRTBZGQ4OJQnejGigoYJFqempFWmZOSUIaSYOTpDhPEDDjUBqeIsLEnOLM9Mh + 8qcYFaXEef1AEgIgiYzSPLheWJS/YhQHekWYtw6kigeYIOC6XwENZgIa3KYcDDK4JBEhJdXA + ePzhjKyFkks2vsq41PJ46ft4810/cl/beO96q/NhYvjyggbxlPcMlcVKQeeatznFnHLtCDrf + Xu44pe3z6vCb/tmTt9y7tD3NQXunv32I6szKlZvirTluOr1acCTGkDXI79uxtBq7bf2f//Am + L6vfxtbcNjXq73m1x8lrv1SzTC7RTk1wdFu/TYmlOCPRUIu5qDgRAJtwZU/NAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 06 Mar 2012 18:48:53 -0000 + +Just code motion. +--- + notmuch-show.c | 100 ++++++++++++++++++++++++++++---------------------------- + 1 files changed, 50 insertions(+), 50 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 648f468..b3a4550 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -219,56 +219,6 @@ _is_from_line (const char *line) + return 0; + } + +-/* Print a message in "mboxrd" format as documented, for example, +- * here: +- * +- * http://qmail.org/qmail-manual-html/man5/mbox.html +- */ +-static void +-format_message_mbox (const void *ctx, +- notmuch_message_t *message, +- unused (int indent)) +-{ +- const char *filename; +- FILE *file; +- const char *from; +- +- time_t date; +- struct tm date_gmtime; +- char date_asctime[26]; +- +- char *line = NULL; +- size_t line_size; +- ssize_t line_len; +- +- filename = notmuch_message_get_filename (message); +- file = fopen (filename, "r"); +- if (file == NULL) { +- fprintf (stderr, "Failed to open %s: %s\n", +- filename, strerror (errno)); +- return; +- } +- +- from = notmuch_message_get_header (message, "from"); +- from = _extract_email_address (ctx, from); +- +- date = notmuch_message_get_date (message); +- gmtime_r (&date, &date_gmtime); +- asctime_r (&date_gmtime, date_asctime); +- +- printf ("From %s %s", from, date_asctime); +- +- while ((line_len = getline (&line, &line_size, file)) != -1 ) { +- if (_is_from_line (line)) +- putchar ('>'); +- printf ("%s", line); +- } +- +- printf ("\n"); +- +- fclose (file); +-} +- + static void + format_headers_message_part_text (GMimeMessage *message) + { +@@ -762,6 +712,56 @@ format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent), + return NOTMUCH_STATUS_SUCCESS; + } + ++/* Print a message in "mboxrd" format as documented, for example, ++ * here: ++ * ++ * http://qmail.org/qmail-manual-html/man5/mbox.html ++ */ ++static void ++format_message_mbox (const void *ctx, ++ notmuch_message_t *message, ++ unused (int indent)) ++{ ++ const char *filename; ++ FILE *file; ++ const char *from; ++ ++ time_t date; ++ struct tm date_gmtime; ++ char date_asctime[26]; ++ ++ char *line = NULL; ++ size_t line_size; ++ ssize_t line_len; ++ ++ filename = notmuch_message_get_filename (message); ++ file = fopen (filename, "r"); ++ if (file == NULL) { ++ fprintf (stderr, "Failed to open %s: %s\n", ++ filename, strerror (errno)); ++ return; ++ } ++ ++ from = notmuch_message_get_header (message, "from"); ++ from = _extract_email_address (ctx, from); ++ ++ date = notmuch_message_get_date (message); ++ gmtime_r (&date, &date_gmtime); ++ asctime_r (&date_gmtime, date_asctime); ++ ++ printf ("From %s %s", from, date_asctime); ++ ++ while ((line_len = getline (&line, &line_size, file)) != -1 ) { ++ if (_is_from_line (line)) ++ putchar ('>'); ++ printf ("%s", line); ++ } ++ ++ printf ("\n"); ++ ++ fclose (file); ++} ++ + static notmuch_status_t + show_message (void *ctx, + const notmuch_show_format_t *format, +-- +1.7.7.3 + -- 2.26.2