1 Return-Path: <jani@nikula.org>
\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 C2581431FD9
\r
6 for <notmuch@notmuchmail.org>; Fri, 9 Mar 2012 14:33:46 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id lidQAWwVhZKb for <notmuch@notmuchmail.org>;
\r
17 Fri, 9 Mar 2012 14:33:45 -0800 (PST)
\r
18 Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com
\r
19 [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id E7DF8431FC3
\r
22 for <notmuch@notmuchmail.org>; Fri, 9 Mar 2012 14:33:41 -0800 (PST)
\r
23 Received: by mail-lpp01m010-f53.google.com with SMTP id c1so2252374lah.26
\r
24 for <notmuch@notmuchmail.org>; Fri, 09 Mar 2012 14:33:41 -0800 (PST)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
28 :in-reply-to:references:x-gm-message-state;
\r
29 bh=6qzoLyJoPQFeHfB/mPvQtx1WiF85SdzYS1GQpO0CbbY=;
\r
30 b=SB+pykOm+HUiDWzmpCCG3cFkRaG30y2ViAmiyPc877Tc+d6PmLsB0064UNV4sr9VW5
\r
31 BHbhEwDdQOYM5G8byGqa0Le0MUho84I9x0NxsUq28GhZ4aCrMWzngbonPibVQMZ3EyMp
\r
32 r3E1k08TPxSjbhtogBeeZhdfT7oeMbgwFhW2RFs37AyrNijjPYxWRZ/XeWL19AeiJMsc
\r
33 g1CpWNqaimpT0YNPzBnZy9p6mX9manjQOWdeig+/OHUZmuSE1oy2uEBE+/TJT3H1SAgK
\r
34 //hgk8GWZQ+2U02Ldpu0zmDHIyshoy8JtUdgy6+SWtL5POxsFJBxG2RVyLeqxIih6fZY
\r
36 Received: by 10.112.29.34 with SMTP id g2mr1538610lbh.40.1331332421524;
\r
37 Fri, 09 Mar 2012 14:33:41 -0800 (PST)
\r
38 Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id mf3sm5903748lab.1.2012.03.09.14.33.39
\r
41 (version=SSLv3 cipher=OTHER); Fri, 09 Mar 2012 14:33:40 -0800 (PST)
\r
42 From: Jani Nikula <jani@nikula.org>
\r
43 To: notmuch@notmuchmail.org,
\r
44 markwalters1009@gmail.com
\r
45 Subject: [PATCH 2/3] command-line-arguments: support keyword arguments with
\r
47 Date: Sat, 10 Mar 2012 00:33:29 +0200
\r
49 <61518702fe578babfae49cd2098a996dc6759efe.1331329406.git.jani@nikula.org>
\r
50 X-Mailer: git-send-email 1.7.5.4
\r
51 In-Reply-To: <cover.1331329406.git.jani@nikula.org>
\r
52 References: <87399iicit.fsf@qmul.ac.uk> <cover.1331329406.git.jani@nikula.org>
\r
53 In-Reply-To: <cover.1331329406.git.jani@nikula.org>
\r
54 References: <cover.1331329406.git.jani@nikula.org>
\r
56 ALoCoQmhagjEzf4Cp+r1fhAmGsAawHGjagB6MsJ99q7lzgXnU82eCVVmBOSaupmk9cv31xdVmast
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Fri, 09 Mar 2012 22:33:47 -0000
\r
71 Add NOTMUCH_OPT_KEYWORD_DEFAULT to support plain --arg in addition to
\r
72 --arg=value. The value to use is the first in the list of keywords.
\r
74 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
76 command-line-arguments.c | 11 ++++++++++-
\r
77 command-line-arguments.h | 1 +
\r
78 2 files changed, 11 insertions(+), 1 deletions(-)
\r
80 diff --git a/command-line-arguments.c b/command-line-arguments.c
\r
81 index 1bdb881..2a3646f 100644
\r
82 --- a/command-line-arguments.c
\r
83 +++ b/command-line-arguments.c
\r
84 @@ -15,6 +15,13 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
\r
86 const notmuch_keyword_t *keywords = arg_desc->keywords;
\r
88 + if (arg_str == NULL) {
\r
89 + /* no keyword specified, use the first keyword as default */
\r
90 + if (arg_desc->output_var)
\r
91 + *((int *)arg_desc->output_var) = keywords->value;
\r
95 while (keywords->name) {
\r
96 if (strcmp (arg_str, keywords->name) == 0) {
\r
97 if (arg_desc->output_var) {
\r
98 @@ -105,7 +112,8 @@ parse_option (const char *arg,
\r
100 } else if (next == '\0') {
\r
102 - if (try->opt_type != NOTMUCH_OPT_BOOLEAN)
\r
103 + if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&
\r
104 + try->opt_type != NOTMUCH_OPT_KEYWORD_DEFAULT)
\r
108 @@ -116,6 +124,7 @@ parse_option (const char *arg,
\r
110 switch (try->opt_type) {
\r
111 case NOTMUCH_OPT_KEYWORD:
\r
112 + case NOTMUCH_OPT_KEYWORD_DEFAULT:
\r
113 return _process_keyword_arg (try, value);
\r
115 case NOTMUCH_OPT_BOOLEAN:
\r
116 diff --git a/command-line-arguments.h b/command-line-arguments.h
\r
117 index de1734a..d70c84c 100644
\r
118 --- a/command-line-arguments.h
\r
119 +++ b/command-line-arguments.h
\r
120 @@ -8,6 +8,7 @@ enum notmuch_opt_type {
\r
121 NOTMUCH_OPT_BOOLEAN, /* --verbose */
\r
122 NOTMUCH_OPT_INT, /* --frob=8 */
\r
123 NOTMUCH_OPT_KEYWORD, /* --format=raw|json|text */
\r
124 + NOTMUCH_OPT_KEYWORD_DEFAULT,/* --format[=raw|json] */
\r
125 NOTMUCH_OPT_STRING, /* --file=/tmp/gnarf.txt */
\r
126 NOTMUCH_OPT_POSITION /* notmuch dump pos_arg */
\r