--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0EABE431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 28 May 2012 12:06:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5E1MeDgEbCYO for <notmuch@notmuchmail.org>;\r
+ Mon, 28 May 2012 12:05:59 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 6BC0E431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 28 May 2012 12:05:59 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SZ5GP-00059T-PW; Mon, 28 May 2012 20:05:58 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SZ5GP-0004zJ-FR; Mon, 28 May 2012 20:05:57 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 1/6] cli: command line parsing: allow default for\r
+ keyword options\r
+In-Reply-To: <20120528233152.GD2331@hili.localdomain>\r
+References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>\r
+ <1338106946-7611-2-git-send-email-markwalters1009@gmail.com>\r
+ <20120528233152.GD2331@hili.localdomain>\r
+User-Agent: Notmuch/0.13+55~g992aa73 (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 28 May 2012 20:05:59 +0100\r
+Message-ID: <87wr3wm8h4.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 17348e85adb1b37609a0f97eaae292ee (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 28 May 2012 19:06:00 -0000\r
+\r
+\r
+On Mon, 28 May 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> On Sun, 27 May 2012 09:22:21 +0100, Mark Walters <markwalters1009@gmail.com> wrote:\r
+>> This changes the parsing for "keyword" options so that if the option\r
+>> is specified with no argument the argument is parsed as if it were\r
+>> passed an empty string. This make it easier to add options to existing\r
+>> boolean arguments (the existing --option can default to TRUE).\r
+>> ---\r
+>> command-line-arguments.c | 17 +++++++++++++----\r
+>> 1 files changed, 13 insertions(+), 4 deletions(-)\r
+>> \r
+>> diff --git a/command-line-arguments.c b/command-line-arguments.c\r
+>> index 76b185f..2fb8a1b 100644\r
+>> --- a/command-line-arguments.c\r
+>> +++ b/command-line-arguments.c\r
+>> @@ -11,10 +11,15 @@\r
+>> */\r
+>> \r
+>> static notmuch_bool_t\r
+>> -_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {\r
+>> +_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {\r
+>> \r
+>> const notmuch_keyword_t *keywords = arg_desc->keywords;\r
+>> \r
+>> + if (next == 0) {\r
+>> + /* No keyword given */\r
+>> + arg_str="";\r
+>> + }\r
+>> +\r
+>\r
+> Whitespace.\r
+\r
+Will fix\r
+\r
+>> while (keywords->name) {\r
+>> if (strcmp (arg_str, keywords->name) == 0) {\r
+>> if (arg_desc->output_var) {\r
+>> @@ -24,7 +29,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {\r
+>> }\r
+>> keywords++;\r
+>> }\r
+>> - fprintf (stderr, "unknown keyword: %s\n", arg_str);\r
+>> + if (next!=0)\r
+>\r
+> Whitespace.\r
+\r
+Will fix\r
+\r
+>> + fprintf (stderr, "unknown keyword: %s\n", arg_str);\r
+>> + else\r
+>> + fprintf (stderr, "option %s needs a keyword\n", arg_desc->name);\r
+>\r
+> I think "keyword argument" is clearer.\r
+\r
+I think I agree: the reason I kept it is that the first case is the\r
+existing error message. Any comments from anyone?\r
+\r
+Best wishes\r
+\r
+Mark\r
projects / notmuch-archives.git / commitdiff