1 Return-Path: <bremner@pivot.cs.unb.ca>
\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 DFEFE431FC0
\r
6 for <notmuch@notmuchmail.org>; Sat, 19 Dec 2009 06:55:52 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 Received: from olra.theworths.org ([127.0.0.1])
\r
9 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
10 with ESMTP id pUbDx7Vumlmf for <notmuch@notmuchmail.org>;
\r
11 Sat, 19 Dec 2009 06:55:52 -0800 (PST)
\r
12 Received: from pivot.cs.unb.ca (pivot.cs.unb.ca [131.202.240.57])
\r
13 by olra.theworths.org (Postfix) with ESMTP id 4AB09431FAE
\r
14 for <notmuch@notmuchmail.org>; Sat, 19 Dec 2009 06:55:52 -0800 (PST)
\r
16 fctnnbsc30w-142167182194.pppoe-dynamic.high-speed.nb.bellaliant.net
\r
17 ([142.167.182.194] helo=localhost)
\r
18 by pivot.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
\r
19 (Exim 4.69) (envelope-from <bremner@pivot.cs.unb.ca>)
\r
20 id 1NM0il-0003aH-Uw; Sat, 19 Dec 2009 10:55:52 -0400
\r
21 Received: from bremner by localhost with local (Exim 4.69)
\r
22 (envelope-from <bremner@pivot.cs.unb.ca>)
\r
23 id 1NM0ig-0006eW-HK; Sat, 19 Dec 2009 10:55:46 -0400
\r
24 From: david@tethera.net
\r
25 To: notmuch@notmuchmail.org
\r
26 Date: Sat, 19 Dec 2009 10:55:22 -0400
\r
27 Message-Id: <1261234524-25522-2-git-send-email-david@tethera.net>
\r
28 X-Mailer: git-send-email 1.6.5.3
\r
29 In-Reply-To: <1261234524-25522-1-git-send-email-david@tethera.net>
\r
30 References: <87iqc4yyo8.fsf@yoom.home.cworth.org>
\r
31 <1261234524-25522-1-git-send-email-david@tethera.net>
\r
32 X-Sender-Verified: bremner@pivot.cs.unb.ca
\r
33 Cc: David Bremner <bremner@unb.ca>
\r
34 Subject: [notmuch] [PATCH 1/3] rename option to select output format to
\r
35 --format from --output.
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.12
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Sat, 19 Dec 2009 14:55:53 -0000
\r
50 From: David Bremner <bremner@unb.ca>
\r
53 notmuch-search.c | 6 +++---
\r
54 notmuch-show.c | 6 +++---
\r
55 2 files changed, 6 insertions(+), 6 deletions(-)
\r
57 diff --git a/notmuch-search.c b/notmuch-search.c
\r
58 index e243747..482c6e8 100644
\r
59 --- a/notmuch-search.c
\r
60 +++ b/notmuch-search.c
\r
61 @@ -221,14 +221,14 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
\r
62 fprintf (stderr, "Invalid value for --sort: %s\n", opt);
\r
65 - } else if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
\r
66 - opt = argv[i] + sizeof ("--output=") - 1;
\r
67 + } else if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {
\r
68 + opt = argv[i] + sizeof ("--format=") - 1;
\r
69 if (strcmp (opt, "text") == 0) {
\r
70 format = &format_text;
\r
71 } else if (strcmp (opt, "json") == 0) {
\r
72 format = &format_json;
\r
74 - fprintf (stderr, "Invalid value for --output: %s\n", opt);
\r
75 + fprintf (stderr, "Invalid value for --format: %s\n", opt);
\r
79 diff --git a/notmuch-show.c b/notmuch-show.c
\r
80 index b5b3eba..b6e3f44 100644
\r
81 --- a/notmuch-show.c
\r
82 +++ b/notmuch-show.c
\r
83 @@ -406,15 +406,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
87 - if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
\r
88 - opt = argv[i] + sizeof ("--output=") - 1;
\r
89 + if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {
\r
90 + opt = argv[i] + sizeof ("--format=") - 1;
\r
91 if (strcmp (opt, "text") == 0) {
\r
92 format = &format_text;
\r
93 } else if (strcmp (opt, "json") == 0) {
\r
94 format = &format_json;
\r
97 - fprintf (stderr, "Invalid value for --output: %s\n", opt);
\r
98 + fprintf (stderr, "Invalid value for --format: %s\n", opt);
\r
101 } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {
\r