[Patch v7 1/6] cli: command line parsing: allow default for keyword options

diff --git a/41/aad0ddc7fe984d91a453740f5ae44a31248c58 b/41/aad0ddc7fe984d91a453740f5ae44a31248c58
new file mode 100644 (file)
index 0000000..eedd179
--- /dev/null
+++ b/41/aad0ddc7fe984d91a453740f5ae44a31248c58
@@ -0,0 +1,126 @@
+Return-Path: <markwalters1009@gmail.com>\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 3BCC7431FC2\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 0QpAaHp01uCh for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jun 2012 04:46:20 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E6539431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:19 -0700 (PDT)\r
+Received: by werj55 with SMTP id j55so2729830wer.26\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Jun 2012 04:46:18 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=ba2TXiOJxZGeViEVJJ/ucZP1tFS2i3Nle6Yh8ac+HJk=;\r
+       b=DbckokSxpdZEQmw8JppNFslhMWhMNUWhlR+i0DOFwL3TIQc7UJ/M8XzdH7XQ6V9srY\r
+       NiA/FSnvM74RKuO3EgXX5ogTVlpAmg7Epk+07G9YBsVPLr+9Bv9rnVDhK762qrJQ+LBA\r
+       P198BVpABprTEE7hKfNxkvl/pAejO4DgdnmAAcAfRy3VYStRymgkP2k9Tt/rbx2GpwC2\r
+       hyuzEOkAljs0y7o1SJ6/BERgNE1cb8vUNnphAFgAablh2LDJG+eQ+LKYaryO/fyBQdxq\r
+       tTod0k1PJrqfmjbexePh+WEWHWH79i+BEUKKdnnD693roF6jYREHYOq5CBlOl/lx25Gm\r
+       2nXg==\r
+Received: by 10.216.202.160 with SMTP id d32mr4892028weo.147.1338723978561;\r
+       Sun, 03 Jun 2012 04:46:18 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ ei4sm19462981wid.5.2012.06.03.04.46.17        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 03 Jun 2012 04:46:17 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 1/6] cli: command line parsing: allow default for keyword\r
+       options\r
+Date: Sun,  3 Jun 2012 12:46:07 +0100\r
+Message-Id: <1338723972-13063-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>\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: Sun, 03 Jun 2012 11:46:22 -0000\r
+\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..b0a0dab 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
+     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
++      fprintf (stderr, "unknown keyword: %s\n", arg_str);\r
++    else\r
++      fprintf (stderr, "option %s needs a keyword\n", arg_desc->name);\r
+     return FALSE;\r
+ }\r
+ \r
+@@ -99,7 +107,8 @@ parse_option (const char *arg,\r
+            */\r
+           if (next != '=' && next != ':' && next != 0) return FALSE;\r
+           if (next == 0) {\r
+-              if (try->opt_type != NOTMUCH_OPT_BOOLEAN)\r
++              if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&\r
++                  try->opt_type != NOTMUCH_OPT_KEYWORD)\r
+                   return FALSE;\r
+           } else {\r
+               if (value[0] == 0) return FALSE;\r
+@@ -110,7 +119,7 @@ parse_option (const char *arg,\r
+ \r
+           switch (try->opt_type) {\r
+           case NOTMUCH_OPT_KEYWORD:\r
+-              return _process_keyword_arg (try, value);\r
++              return _process_keyword_arg (try, next, value);\r
+               break;\r
+           case NOTMUCH_OPT_BOOLEAN:\r
+               return _process_boolean_arg (try, next, value);\r
+-- \r
+1.7.9.1\r
+\r