[PATCH 2/3] command-line-arguments: support keyword arguments with default value

diff --git a/20/97d16eaaa3a6eaf31ff24fa07f9a5c375d14c8 b/20/97d16eaaa3a6eaf31ff24fa07f9a5c375d14c8
new file mode 100644 (file)
index 0000000..04a8c05
--- /dev/null
+++ b/20/97d16eaaa3a6eaf31ff24fa07f9a5c375d14c8
@@ -0,0 +1,130 @@
+Return-Path: <jani@nikula.org>\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 C2581431FD9\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 lidQAWwVhZKb for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Mar 2012 14:33:45 -0800 (PST)\r
+Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E7DF8431FC3\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:41 -0800 (PST)\r
+Received: by mail-lpp01m010-f53.google.com with SMTP id c1so2252374lah.26\r
+       for <notmuch@notmuchmail.org>; Fri, 09 Mar 2012 14:33:41 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=6qzoLyJoPQFeHfB/mPvQtx1WiF85SdzYS1GQpO0CbbY=;\r
+       b=SB+pykOm+HUiDWzmpCCG3cFkRaG30y2ViAmiyPc877Tc+d6PmLsB0064UNV4sr9VW5\r
+       BHbhEwDdQOYM5G8byGqa0Le0MUho84I9x0NxsUq28GhZ4aCrMWzngbonPibVQMZ3EyMp\r
+       r3E1k08TPxSjbhtogBeeZhdfT7oeMbgwFhW2RFs37AyrNijjPYxWRZ/XeWL19AeiJMsc\r
+       g1CpWNqaimpT0YNPzBnZy9p6mX9manjQOWdeig+/OHUZmuSE1oy2uEBE+/TJT3H1SAgK\r
+       //hgk8GWZQ+2U02Ldpu0zmDHIyshoy8JtUdgy6+SWtL5POxsFJBxG2RVyLeqxIih6fZY\r
+       NfpQ==\r
+Received: by 10.112.29.34 with SMTP id g2mr1538610lbh.40.1331332421524;\r
+       Fri, 09 Mar 2012 14:33:41 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.\r
+       [84.248.80.253])\r
+       by mx.google.com with ESMTPS id mf3sm5903748lab.1.2012.03.09.14.33.39\r
+       (version=SSLv3 cipher=OTHER); Fri, 09 Mar 2012 14:33:40 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org,\r
+       markwalters1009@gmail.com\r
+Subject: [PATCH 2/3] command-line-arguments: support keyword arguments with\r
+       default value\r
+Date: Sat, 10 Mar 2012 00:33:29 +0200\r
+Message-Id:\r
+ <61518702fe578babfae49cd2098a996dc6759efe.1331329406.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1331329406.git.jani@nikula.org>\r
+References: <87399iicit.fsf@qmul.ac.uk> <cover.1331329406.git.jani@nikula.org>\r
+In-Reply-To: <cover.1331329406.git.jani@nikula.org>\r
+References: <cover.1331329406.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmhagjEzf4Cp+r1fhAmGsAawHGjagB6MsJ99q7lzgXnU82eCVVmBOSaupmk9cv31xdVmast\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: Fri, 09 Mar 2012 22:33:47 -0000\r
+\r
+Add NOTMUCH_OPT_KEYWORD_DEFAULT to support plain --arg in addition to\r
+--arg=value. The value to use is the first in the list of keywords.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ command-line-arguments.c |   11 ++++++++++-\r
+ command-line-arguments.h |    1 +\r
+ 2 files changed, 11 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/command-line-arguments.c b/command-line-arguments.c\r
+index 1bdb881..2a3646f 100644\r
+--- a/command-line-arguments.c\r
++++ b/command-line-arguments.c\r
+@@ -15,6 +15,13 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {\r
+ \r
+     const notmuch_keyword_t *keywords = arg_desc->keywords;\r
+ \r
++    if (arg_str == NULL) {\r
++      /* no keyword specified, use the first keyword as default */\r
++      if (arg_desc->output_var)\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
+@@ -105,7 +112,8 @@ parse_option (const char *arg,\r
+                   return FALSE;\r
+           } else if (next == '\0') {\r
+               value = NULL;\r
+-              if (try->opt_type != NOTMUCH_OPT_BOOLEAN)\r
++              if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&\r
++                  try->opt_type != NOTMUCH_OPT_KEYWORD_DEFAULT)\r
+                   return FALSE;\r
+           } else {\r
+               return FALSE;\r
+@@ -116,6 +124,7 @@ parse_option (const char *arg,\r
+ \r
+           switch (try->opt_type) {\r
+           case NOTMUCH_OPT_KEYWORD:\r
++          case NOTMUCH_OPT_KEYWORD_DEFAULT:\r
+               return _process_keyword_arg (try, value);\r
+               break;\r
+           case NOTMUCH_OPT_BOOLEAN:\r
+diff --git a/command-line-arguments.h b/command-line-arguments.h\r
+index de1734a..d70c84c 100644\r
+--- a/command-line-arguments.h\r
++++ b/command-line-arguments.h\r
+@@ -8,6 +8,7 @@ enum notmuch_opt_type {\r
+     NOTMUCH_OPT_BOOLEAN,      /* --verbose              */\r
+     NOTMUCH_OPT_INT,          /* --frob=8               */\r
+     NOTMUCH_OPT_KEYWORD,      /* --format=raw|json|text */\r
++    NOTMUCH_OPT_KEYWORD_DEFAULT,/* --format[=raw|json]    */\r
+     NOTMUCH_OPT_STRING,               /* --file=/tmp/gnarf.txt  */\r
+     NOTMUCH_OPT_POSITION      /* notmuch dump pos_arg   */\r
+ };\r
+-- \r
+1.7.5.4\r
+\r