1 Return-Path: <amthrax@drake.mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 113ED431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:03 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id XII1fBCS07g4 for <notmuch@notmuchmail.org>;
\r
16 Sat, 7 Apr 2012 17:58:02 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 64039431FD6
\r
20 for <notmuch@notmuchmail.org>; Sat, 7 Apr 2012 17:58:00 -0700 (PDT)
\r
21 X-AuditID: 12074425-b7f4a6d0000008e0-68-4f80e2972140
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 81.05.02272.792E08F4; Sat, 7 Apr 2012 20:57:59 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxnP005095;
\r
27 Sat, 7 Apr 2012 20:57:59 -0400
\r
28 Received: from drake.mit.edu
\r
29 (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [209.6.116.242]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q380vwHV002165
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Sat, 7 Apr 2012 20:57:58 -0400 (EDT)
\r
35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
36 (envelope-from <amthrax@drake.mit.edu>)
\r
37 id 1SGgS6-0001SP-1F; Sat, 07 Apr 2012 20:57:58 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 2/6] show: Remove support for old-style formatters in
\r
42 Date: Sat, 7 Apr 2012 20:57:46 -0400
\r
43 Message-Id: <1333846670-5356-3-git-send-email-amdragon@mit.edu>
\r
44 X-Mailer: git-send-email 1.7.9.1
\r
45 In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>
\r
46 References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>
\r
47 X-Brightmail-Tracker:
\r
48 H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wdvl1hbXb85kdmD0eLbq
\r
49 FnMAYxSXTUpqTmZZapG+XQJXxvYfW1kKrvBXfN5ygr2BcR5PFyMnh4SAiUTL/tXMELaYxIV7
\r
50 69m6GLk4hAT2MUrsuXOaFcJZzyix+PwxdgjnHpPE2RvbmCCc+YwSS+5eAutnE9CQ2LZ/OSOI
\r
51 LSIgLbHz7mygdg4OZgE1iT9dKiBhYYEgiW/rn7GA2CwCqhJL3yxlBynhFbCXuP/JBeIKBYln
\r
52 644zgdicAg4S21u3gk0XAipZuvg44wRG/gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0LfRy
\r
53 M0v0UlNKNzGCgobdRXUH44RDSocYBTgYlXh4LXY3+AuxJpYVV+YeYpTkYFIS5X36ACjEl5Sf
\r
54 UpmRWJwRX1Sak1p8iFGCg1lJhPf+YaAcb0piZVVqUT5MSpqDRUmcV1PrnZ+QQHpiSWp2ampB
\r
55 ahFMVoaDQ0mC9/VDoEbBotT01Iq0zJwShDQTByfIcB6g4ZKPQIYXFyTmFmemQ+RPMSpKifO+
\r
56 AGkWAElklObB9cKi+hWjONArwrzfQap4gAkBrvsV0GAmoME1r+pBBpckIqSkGhh1E+1bxI+G
\r
57 96feXOxe8Np80oEU3u0RtrzcRiW79bptfvJO/GT+SD5SK/Hsliy935yLVddvPzjt5rMUk1ID
\r
58 K+8ebSv23z/e8iydx88ldXLG8r93XBl2npP/vSqjOVjf6c812dBXe/9rdjXKr3hyL8oq/5ir
\r
59 8GK3HXIzdJdd+OFwW1mqdYVXUoESS3FGoqEWc1FxIgAzq8zTxQIAAA==
\r
60 X-BeenThere: notmuch@notmuchmail.org
\r
61 X-Mailman-Version: 2.1.13
\r
63 List-Id: "Use and development of the notmuch mail system."
\r
64 <notmuch.notmuchmail.org>
\r
65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
68 List-Post: <mailto:notmuch@notmuchmail.org>
\r
69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
72 X-List-Received-Date: Sun, 08 Apr 2012 00:58:03 -0000
\r
74 show_message used to have a compatibility path for old-style
\r
75 formatters. This removes that.
\r
77 notmuch-show.c | 52 +++++++++++++---------------------------------------
\r
78 1 files changed, 13 insertions(+), 39 deletions(-)
\r
80 diff --git a/notmuch-show.c b/notmuch-show.c
\r
81 index 0bf5e21..5a71115 100644
\r
82 --- a/notmuch-show.c
\r
83 +++ b/notmuch-show.c
\r
84 @@ -815,46 +815,20 @@ show_message (void *ctx,
\r
86 notmuch_show_params_t *params)
\r
88 - if (format->part) {
\r
89 - void *local = talloc_new (ctx);
\r
90 - mime_node_t *root, *part;
\r
91 - notmuch_status_t status;
\r
93 - status = mime_node_open (local, message, params->cryptoctx,
\r
94 - params->decrypt, &root);
\r
97 - part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
\r
99 - status = format->part (local, part, indent, params);
\r
101 - talloc_free (local);
\r
105 - if (params->part <= 0) {
\r
106 - fputs (format->message_start, stdout);
\r
107 - if (format->message)
\r
108 - format->message(ctx, message, indent);
\r
110 - fputs (format->header_start, stdout);
\r
111 - if (format->header)
\r
112 - format->header(ctx, message);
\r
113 - fputs (format->header_end, stdout);
\r
115 - fputs (format->body_start, stdout);
\r
118 - if (format->part_content)
\r
119 - show_message_body (message, format, params);
\r
121 - if (params->part <= 0) {
\r
122 - fputs (format->body_end, stdout);
\r
124 - fputs (format->message_end, stdout);
\r
126 + void *local = talloc_new (ctx);
\r
127 + mime_node_t *root, *part;
\r
128 + notmuch_status_t status;
\r
130 - return NOTMUCH_STATUS_SUCCESS;
\r
131 + status = mime_node_open (local, message, params->cryptoctx,
\r
132 + params->decrypt, &root);
\r
135 + part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
\r
137 + status = format->part (local, part, indent, params);
\r
139 + talloc_free (local);
\r
143 static notmuch_status_t
\r