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 47BDF431FAE
\r
6 for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:05 -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 4PvYuAL2QCtf for <notmuch@notmuchmail.org>;
\r
18 Sat, 16 Jun 2012 03:22:04 -0700 (PDT)
\r
19 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com
\r
20 [209.85.212.179]) (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 A023B431FB6
\r
23 for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:04 -0700 (PDT)
\r
24 Received: by wibhr14 with SMTP id hr14so238325wib.2
\r
25 for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:03 -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=C2Qso/piHzdXf9qMEk6by0vVYXG01JFkonPwYDwzSCoxPrgLNh9ktKlQxKhWj4tdB3
\r
30 2vmI/u3qtVVsQjGhg74cpTlkjfY2bLWIgmAvllfJSBWMfX1vqHYHerh3p68HbZcGQSUf
\r
31 1jAMNfg+CrIrEfgpFgu4v3Ai70JaW22qonknf5FWK9gixxbsPd/J4GQcjsFpznIK4Lur
\r
32 4NfvbyAA/SvK42yGx4GH5PaISGzz1CSvvQBfYmIPh6+NP1f45eJ4I4gvSUndvhT1vXDs
\r
33 pn/FuZ1wX/zMCdmwM4/IogiDYnhg2GdaYZhV6dsWrWJg83Wc55g6fPCQhGejNXYLqDLW
\r
35 Received: by 10.216.213.143 with SMTP id a15mr5157705wep.156.1339842123201;
\r
36 Sat, 16 Jun 2012 03:22:03 -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 hv7sm16617138wib.0.2012.06.16.03.22.01 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 16 Jun 2012 03:22:02 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [Patch v8 1/6] cli: command line parsing: allow default for keyword
\r
45 Date: Sat, 16 Jun 2012 11:21:42 +0100
\r
46 Message-Id: <1339842107-10632-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1339842107-10632-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1339842107-10632-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: Sat, 16 Jun 2012 10:22:05 -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