[PATCH 1/3] command-line-arguments: allow true and false keywords for booleans

diff --git a/2d/9492af2452cd42c7f02a9e7f76458fc7a08f03 b/2d/9492af2452cd42c7f02a9e7f76458fc7a08f03
new file mode 100644 (file)
index 0000000..8fd0bb0
--- /dev/null
+++ b/2d/9492af2452cd42c7f02a9e7f76458fc7a08f03
@@ -0,0 +1,144 @@
+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 17394431FD5\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:41 -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 JfYLo7ukg+9l for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Mar 2012 14:33:40 -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 C2DEC431FBC\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:39 -0800 (PST)\r
+Received: by lahc1 with SMTP id c1so2252405lah.26\r
+       for <notmuch@notmuchmail.org>; Fri, 09 Mar 2012 14:33:38 -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=tsCtHOpkj9Trncg1WOhNl12I7F6DJUEhYBaBz+mB3Js=;\r
+       b=LkZRvxTSdW+muycYtagYQPCSMDuGC/QqTip6d+gx51ccEmBUir5q2fPLiZp7kXRcfo\r
+       HO9a5pk0To/CQDlCkvY415SxNk4B7lgi5WM3VpJaJ67ruLQoVvC7+wdbOj5B56MuPaOU\r
+       W4xPuYCiiL8saGVoIabcJpu5FcMErOmJJer1agckUpP0T8KFC0J2klty15uM0VmTrMJ7\r
+       Qhm6ei1Im7DVjVMW66hsOvEubJYV63t24gvARdKODNKt8EsucmAJX/14CpPs7ewqBe7T\r
+       Pmi9O0KtL/Wa2kuWV62gPGe77evHXySo/Fh0CGBoL9rUCMieYK8rpjNIEPGSZZ7MLJeS\r
+       KnvQ==\r
+Received: by 10.112.104.37 with SMTP id gb5mr1422457lbb.97.1331332418203;\r
+       Fri, 09 Mar 2012 14:33:38 -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 hv2sm7989056lbb.9.2012.03.09.14.33.36\r
+       (version=SSLv3 cipher=OTHER); Fri, 09 Mar 2012 14:33:37 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org,\r
+       markwalters1009@gmail.com\r
+Subject: [PATCH 1/3] command-line-arguments: allow true and false keywords for\r
+       booleans\r
+Date: Sat, 10 Mar 2012 00:33:28 +0200\r
+Message-Id:\r
+ <461127379f76af5ec6f53ede0ac173e37aae392d.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
+ ALoCoQm9tJjYYVxBry5UkmGHImpuTnx2PGNQeQDRO3BQM7EljfVbO6YUOFX5favBmG+SJOKIYZ0G\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:41 -0000\r
+\r
+Add support for --arg=true and --arg=false for NOTMUCH_OPT_BOOLEAN\r
+arguments to be able to disable a boolean argument. Plain --arg\r
+remains unchanged, meaning true.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ command-line-arguments.c |   36 ++++++++++++++++++++++++++++++------\r
+ 1 files changed, 30 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/command-line-arguments.c b/command-line-arguments.c\r
+index e711414..1bdb881 100644\r
+--- a/command-line-arguments.c\r
++++ b/command-line-arguments.c\r
+@@ -28,6 +28,27 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {\r
+     return FALSE;\r
+ }\r
+ \r
++static notmuch_bool_t\r
++_process_boolean_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str)\r
++{\r
++    notmuch_bool_t value = TRUE;\r
++\r
++    if (arg_str) {\r
++      if (strcmp (arg_str, "true") == 0) {\r
++          value = TRUE;\r
++      } else if (strcmp (arg_str, "false") == 0) {\r
++          value = FALSE;\r
++      } else {\r
++          fprintf (stderr, "unknown boolean: %s\n", arg_str);\r
++          return FALSE;\r
++      }\r
++    }\r
++\r
++    *((notmuch_bool_t *)arg_desc->output_var) = value;\r
++\r
++    return TRUE;\r
++}\r
++\r
+ /*\r
+    Search for the {pos_arg_index}th position argument, return FALSE if\r
+    that does not exist.\r
+@@ -79,11 +100,15 @@ parse_option (const char *arg,\r
+            * delimiter, and a non-zero length value\r
+            */\r
+ \r
+-          if (try->opt_type != NOTMUCH_OPT_BOOLEAN) {\r
+-              if (next != '=' && next != ':') return FALSE;\r
+-              if (value[0] == 0) return FALSE;\r
++          if (next == '=' || next == ':') {\r
++              if (value[0] == '\0')\r
++                  return FALSE;\r
++          } else if (next == '\0') {\r
++              value = NULL;\r
++              if (try->opt_type != NOTMUCH_OPT_BOOLEAN)\r
++                  return FALSE;\r
+           } else {\r
+-              if (next != 0) return FALSE;\r
++              return FALSE;\r
+           }\r
+ \r
+           if (try->output_var == NULL)\r
+@@ -94,8 +119,7 @@ parse_option (const char *arg,\r
+               return _process_keyword_arg (try, value);\r
+               break;\r
+           case NOTMUCH_OPT_BOOLEAN:\r
+-              *((notmuch_bool_t *)try->output_var) = TRUE;\r
+-              return TRUE;\r
++              return _process_boolean_arg (try, value);\r
+               break;\r
+           case NOTMUCH_OPT_INT:\r
+               *((int *)try->output_var) = strtol (value, &endptr, 10);\r
+-- \r
+1.7.5.4\r
+\r