[PATCH v5 1/5] cli: command line parsing: allow default for keyword options

diff --git a/5f/a25ead98f12bd7a32a5597d961f6da3ab976de b/5f/a25ead98f12bd7a32a5597d961f6da3ab976de
new file mode 100644 (file)
index 0000000..668ddfe
--- /dev/null
+++ b/5f/a25ead98f12bd7a32a5597d961f6da3ab976de
@@ -0,0 +1,115 @@
+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 63C80429E28\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:18 -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 61sNvWWrWFcE for <notmuch@notmuchmail.org>;\r
+       Sat, 26 May 2012 08:55:17 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1725D429E3A\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:07 -0700 (PDT)\r
+Received: by wibhj6 with SMTP id hj6so356882wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:05 -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=Vp6YHrhfdMs2BCMDzGGIScZqEe17XVCJObHCqKDujxI=;\r
+       b=0qqiO9m4ZZikjTB0pkhTi3tR7mUM0/o2qu+DQc9sgWdkW6svNHBXJmNuIpnckhA51O\r
+       YuC7NT21BJHcG68ot1BByQs/2c144s3K0nL+mnHOckoW93BcOPXd7LtFfmpTokciqTef\r
+       UGHfcSqy4MP4gxr7UqfLHJpzSxJE8GaiUzDsP0VUP+XUo7T2TKGtXTCwpQsGz3AbiiXA\r
+       7OxviXgiUlXzlO3mEWT/TfMigw/fL3qsdI+YM2kk3TgJfsfWnHi/POJyxx7eH/CqS0Zs\r
+       1fTO++nqspZuuRsdjC8mEB4aumejHPJFRVmBwpAH6kTFjXvbZSDBw/bQtgiUkyxDhxlo\r
+       n18A==\r
+Received: by 10.180.97.66 with SMTP id dy2mr4245117wib.0.1338047705504;\r
+       Sat, 26 May 2012 08:55:05 -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
+ dg2sm9281682wib.4.2012.05.26.08.55.04 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 26 May 2012 08:55:04 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 1/5] cli: command line parsing: allow default for keyword\r
+       options\r
+Date: Sat, 26 May 2012 16:54:50 +0100\r
+Message-Id: <1338047694-32548-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338047694-32548-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338047694-32548-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: Sat, 26 May 2012 15:55:19 -0000\r
+\r
+This changes the parsing for "keyword" options so that if the option\r
+is specified with no argument the first possible argument is\r
+chosen. This make it easier to add options to existing boolean\r
+arguments (the existing --option can default to TRUE).\r
+---\r
+ command-line-arguments.c |   13 ++++++++++---\r
+ 1 files changed, 10 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/command-line-arguments.c b/command-line-arguments.c\r
+index 76b185f..d40c7e6 100644\r
+--- a/command-line-arguments.c\r
++++ b/command-line-arguments.c\r
+@@ -11,10 +11,16 @@\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 so return first option as default */\r
++      *((int *)arg_desc->output_var) = keywords->value;\r
++      return TRUE;\r
++    }\r
++\r
+     while (keywords->name) {\r
+       if (strcmp (arg_str, keywords->name) == 0) {\r
+           if (arg_desc->output_var) {\r
+@@ -99,7 +105,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 +117,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