1 Return-Path: <markwalters1009@gmail.com>
\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 3BCC7431FC2
\r
6 for <notmuch@notmuchmail.org>; Sun, 3 Jun 2012 04:46:22 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id 0QpAaHp01uCh for <notmuch@notmuchmail.org>;
\r
18 Sun, 3 Jun 2012 04:46:20 -0700 (PDT)
\r
19 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
20 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id E6539431FAF
\r
23 for <notmuch@notmuchmail.org>; Sun, 3 Jun 2012 04:46:19 -0700 (PDT)
\r
24 Received: by werj55 with SMTP id j55so2729830wer.26
\r
25 for <notmuch@notmuchmail.org>; Sun, 03 Jun 2012 04:46:18 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=ba2TXiOJxZGeViEVJJ/ucZP1tFS2i3Nle6Yh8ac+HJk=;
\r
29 b=DbckokSxpdZEQmw8JppNFslhMWhMNUWhlR+i0DOFwL3TIQc7UJ/M8XzdH7XQ6V9srY
\r
30 NiA/FSnvM74RKuO3EgXX5ogTVlpAmg7Epk+07G9YBsVPLr+9Bv9rnVDhK762qrJQ+LBA
\r
31 P198BVpABprTEE7hKfNxkvl/pAejO4DgdnmAAcAfRy3VYStRymgkP2k9Tt/rbx2GpwC2
\r
32 hyuzEOkAljs0y7o1SJ6/BERgNE1cb8vUNnphAFgAablh2LDJG+eQ+LKYaryO/fyBQdxq
\r
33 tTod0k1PJrqfmjbexePh+WEWHWH79i+BEUKKdnnD693roF6jYREHYOq5CBlOl/lx25Gm
\r
35 Received: by 10.216.202.160 with SMTP id d32mr4892028weo.147.1338723978561;
\r
36 Sun, 03 Jun 2012 04:46:18 -0700 (PDT)
\r
37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
38 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
39 ei4sm19462981wid.5.2012.06.03.04.46.17 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sun, 03 Jun 2012 04:46:17 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [Patch v7 1/6] cli: command line parsing: allow default for keyword
\r
45 Date: Sun, 3 Jun 2012 12:46:07 +0100
\r
46 Message-Id: <1338723972-13063-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Sun, 03 Jun 2012 11:46:22 -0000
\r
64 This changes the parsing for "keyword" options so that if the option
\r
65 is specified with no argument the argument is parsed as if it were
\r
66 passed an empty string. This make it easier to add options to existing
\r
67 boolean arguments (the existing --option can default to TRUE).
\r
69 command-line-arguments.c | 17 +++++++++++++----
\r
70 1 files changed, 13 insertions(+), 4 deletions(-)
\r
72 diff --git a/command-line-arguments.c b/command-line-arguments.c
\r
73 index 76b185f..b0a0dab 100644
\r
74 --- a/command-line-arguments.c
\r
75 +++ b/command-line-arguments.c
\r
79 static notmuch_bool_t
\r
80 -_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
\r
81 +_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
\r
83 const notmuch_keyword_t *keywords = arg_desc->keywords;
\r
86 + /* No keyword given */
\r
90 while (keywords->name) {
\r
91 if (strcmp (arg_str, keywords->name) == 0) {
\r
92 if (arg_desc->output_var) {
\r
93 @@ -24,7 +29,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
\r
97 - fprintf (stderr, "unknown keyword: %s\n", arg_str);
\r
99 + fprintf (stderr, "unknown keyword: %s\n", arg_str);
\r
101 + fprintf (stderr, "option %s needs a keyword\n", arg_desc->name);
\r
105 @@ -99,7 +107,8 @@ parse_option (const char *arg,
\r
107 if (next != '=' && next != ':' && next != 0) return FALSE;
\r
109 - if (try->opt_type != NOTMUCH_OPT_BOOLEAN)
\r
110 + if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&
\r
111 + try->opt_type != NOTMUCH_OPT_KEYWORD)
\r
114 if (value[0] == 0) return FALSE;
\r
115 @@ -110,7 +119,7 @@ parse_option (const char *arg,
\r
117 switch (try->opt_type) {
\r
118 case NOTMUCH_OPT_KEYWORD:
\r
119 - return _process_keyword_arg (try, value);
\r
120 + return _process_keyword_arg (try, next, value);
\r
122 case NOTMUCH_OPT_BOOLEAN:
\r
123 return _process_boolean_arg (try, next, value);
\r