1 Return-Path: <novalazy@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 70331431FAF
\r
6 for <notmuch@notmuchmail.org>; Tue, 5 Jun 2012 01:40:46 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, 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 QwcuxfSLJNbk for <notmuch@notmuchmail.org>;
\r
17 Tue, 5 Jun 2012 01:40:45 -0700 (PDT)
\r
18 Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com
\r
19 [209.85.160.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id C5871431FAE
\r
22 for <notmuch@notmuchmail.org>; Tue, 5 Jun 2012 01:40:45 -0700 (PDT)
\r
23 Received: by pbbrr13 with SMTP id rr13so8999057pbb.26
\r
24 for <notmuch@notmuchmail.org>; Tue, 05 Jun 2012 01:40:43 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=date:message-id:from:to:subject:in-reply-to:references:mime-version
\r
27 :content-type:content-disposition:content-transfer-encoding;
\r
28 bh=5VyJmRHtGciy2c7Q1hn3Wv9biuJfyT3RIxwnR2Melb0=;
\r
29 b=Vkllh1HbnKIvkFMNhIEo3Pp0YVIBvCBsCVPwp0jAQsFty5pRNB1xe2pQ6Z19dDFMNj
\r
30 woFLLr6x7yHCSe0KJb1hcXQwKjwaTKvATi66KM8KiJFCbxb8wx1br3KrDyWth/0nWvF2
\r
31 qE4ifMXOyQ/fuY85TWinZy9EQRxh7/R5IGeDRCwBuPGM9IR2Mf4rFgJ4rXx/V2/ZS0+V
\r
32 NwE8xgql8WXD4t4XcFkTcvvzBFQkBHVViNlccuaqz/iLoizNb9UUGBAOL2KfcBQWO/7m
\r
33 06f1YlBwuiZeecLEC638fOuk2JqXOcN5vABNzaVHHEvxGzPjmlT93hsT6PSVVWzl39qJ
\r
35 Received: by 10.68.221.106 with SMTP id qd10mr48647015pbc.42.1338885643696;
\r
36 Tue, 05 Jun 2012 01:40:43 -0700 (PDT)
\r
37 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
39 by mx.google.com with ESMTPS id pb10sm1647030pbc.68.2012.06.05.01.40.40
\r
40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
41 Tue, 05 Jun 2012 01:40:41 -0700 (PDT)
\r
42 Date: Tue, 5 Jun 2012 18:40:37 +1000
\r
43 Message-ID: <20120605184037.GB14297@hili.localdomain>
\r
44 From: Peter Wang <novalazy@gmail.com>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: Re: [PATCH] cli: make the command line parser's errors more
\r
48 In-Reply-To: <1338724128-13158-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
\r
50 <1338724128-13158-1-git-send-email-markwalters1009@gmail.com>
\r
52 Content-Type: text/plain; charset=utf-8
\r
53 Content-Disposition: inline
\r
54 Content-Transfer-Encoding: 8bit
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Tue, 05 Jun 2012 08:40:46 -0000
\r
69 On Sun, 3 Jun 2012 12:48:48 +0100, Mark Walters <markwalters1009@gmail.com> wrote:
\r
71 > +static notmuch_bool_t
\r
72 > +_process_int_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
\r
75 > + if (next == 0 || arg_str[0] == 0) {
\r
76 > + fprintf (stderr, "Option \"%s\" needs an integer argument.\n", arg_desc->name);
\r
80 > + *((int *)arg_desc->output_var) = strtol (arg_str, &endptr, 10);
\r
81 > + if (*endptr == 0)
\r
84 It's usually clearer to write '\0' for the null character.
\r
86 > @@ -99,20 +133,13 @@ parse_option (const char *arg,
\r
87 > char next = arg[strlen (try->name)];
\r
88 > const char *value= arg+strlen(try->name)+1;
\r
92 > - /* Everything but boolean arguments (switches) needs a
\r
93 > - * delimiter, and a non-zero length value. Boolean
\r
94 > - * arguments may take an optional =true or =false value.
\r
96 > - if (next != '=' && next != ':' && next != 0) return FALSE;
\r
97 > - if (next == 0) {
\r
98 > - if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&
\r
99 > - try->opt_type != NOTMUCH_OPT_KEYWORD)
\r
102 > - if (value[0] == 0) return FALSE;
\r
104 > + /* If this is not the end of the argument (i.e. the next
\r
105 > + * character is not a space or a delimiter) we stop
\r
106 > + * parsing for this option but allow the parsing to
\r
107 > + * continue to for other options. This should allow
\r
108 > + * options to be initial segments of other options. */
\r
110 It took me a little while to figure out what the last sentence was
\r
113 If we have not reached the end of the argument (i.e. the next
\r
114 character is not a space or delimiter) then the argument could
\r
115 still match a longer option name later in the option table.
\r
117 (otherwise, "continue to for other")
\r
119 > + if (next != '=' && next != ':' && next != 0)
\r
120 > + goto DONE_THIS_OPTION;
\r
122 The `goto' could be expressed as a `continue' in a `for' loop, AFAICS.
\r
125 > if (try->output_var == NULL)
\r
126 > INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
\r
127 > @@ -125,12 +152,10 @@ parse_option (const char *arg,
\r
128 > return _process_boolean_arg (try, next, value);
\r
130 > case NOTMUCH_OPT_INT:
\r
131 > - *((int *)try->output_var) = strtol (value, &endptr, 10);
\r
132 > - return (*endptr == 0);
\r
133 > + return _process_int_arg (try, next, value);
\r
135 > case NOTMUCH_OPT_STRING:
\r
136 > - *((const char **)try->output_var) = value;
\r
138 > + return _process_string_arg (try, next, value);
\r
140 > case NOTMUCH_OPT_POSITION:
\r
141 > case NOTMUCH_OPT_END:
\r
142 > @@ -139,6 +164,7 @@ parse_option (const char *arg,
\r
146 > + DONE_THIS_OPTION:
\r
149 > fprintf (stderr, "Unrecognized option: --%s\n", arg);
\r