[PATCH v6 1/6] cli: command line parsing: allow default for keyword options

diff --git a/ed/366126b9ffc511d0fffbe9869b562db69020f9 b/ed/366126b9ffc511d0fffbe9869b562db69020f9
new file mode 100644 (file)
index 0000000..d4a20c4
--- /dev/null
+++ b/ed/366126b9ffc511d0fffbe9869b562db69020f9
@@ -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 9D11A431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:33 -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 SXX8T2u0axaf for <notmuch@notmuchmail.org>;\r
+       Sun, 27 May 2012 01:22:33 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 063E0431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:32 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hr14so647090wib.2\r
+       for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:32 -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=/kg2Vyq9tuKaceAyamAWHfWEPBsAK9+XZadak2q92+s=;\r
+       b=YaItgOfnfyfGzgPwjQKRl3kqGL6b7PluapsXAdNhg/LnLGOX2cNeYn3c6/YQyvTu4G\r
+       cjUbd/MaDGwyA/73Cjv1WGPXo526kPmIhl7VR13XtxsmkzRfWT7JKPQqjSi8wImA/9pR\r
+       LQFgUV5TqM+hJKHvNVJiMaqI6BFqBkornREUv2JZTWKYX8wh4N2iS6C1zCR135PyzuV0\r
+       mewCg5tZD9nrhs6Y3S1SXEurWOlZ7pZupcYgSJHs2K7KtdonhJfxSV4KX0WzTMya486g\r
+       ey8qa0w+FiCkesax1t1LnKfc8ptDQXlyiPOhwhv9G4t3Px07ln+hmk2TxlpvhB85MKHq\r
+       MahQ==\r
+Received: by 10.180.99.195 with SMTP id es3mr7662973wib.12.1338106952698;\r
+       Sun, 27 May 2012 01:22:32 -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
+ gv4sm18143624wib.8.2012.05.27.01.22.31        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 27 May 2012 01:22:31 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 1/6] cli: command line parsing: allow default for keyword\r
+       options\r
+Date: Sun, 27 May 2012 09:22:21 +0100\r
+Message-Id: <1338106946-7611-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338106946-7611-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, 27 May 2012 08:22:33 -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..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
+     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