[PATCH 3/7] CLI: convert top level argument parsing to use command-line-arguments

diff --git a/78/e74e9f0ed975e2691499a3ba562618dfc474e0 b/78/e74e9f0ed975e2691499a3ba562618dfc474e0
new file mode 100644 (file)
index 0000000..3c2e2df
--- /dev/null
+++ b/78/e74e9f0ed975e2691499a3ba562618dfc474e0
@@ -0,0 +1,118 @@
+Return-Path: <bremner@tethera.net>\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 DCBF4431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 EkfyYHPTPzfX for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 10:26:43 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C6209431FD4\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:11 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Twd7I-0007xJ-PB; Sat, 19 Jan 2013 14:26:09 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Twd7D-0005aj-6I; Sat, 19 Jan 2013 14:26:03 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/7] CLI: convert top level argument parsing to use\r
+       command-line-arguments\r
+Date: Sat, 19 Jan 2013 14:25:54 -0400\r
+Message-Id: <1358619958-21209-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1358619958-21209-1-git-send-email-david@tethera.net>\r
+References: <1358619958-21209-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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, 19 Jan 2013 18:26:44 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This isn't really a win for conciseness yet, but will make it easier\r
+to add options.\r
+---\r
+ notmuch.c |   22 ++++++++++++++++++----\r
+ 1 file changed, 18 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index f13fd27..a674481 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -249,6 +249,14 @@ main (int argc, char *argv[])\r
+     void *local;\r
+     command_t *command;\r
+     unsigned int i;\r
++    notmuch_bool_t print_help=FALSE, print_version=FALSE;\r
++    int opt_index;\r
++\r
++    notmuch_opt_desc_t options[] = {\r
++      { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },\r
++      { 0, 0, 0, 0, 0 }\r
++    };\r
+ \r
+     talloc_enable_null_tracking ();\r
+ \r
+@@ -263,10 +271,16 @@ main (int argc, char *argv[])\r
+     if (argc == 1)\r
+       return notmuch (local);\r
+ \r
+-    if (strcmp (argv[1], "--help") == 0)\r
++    opt_index = parse_arguments (argc, argv, options, 1);\r
++    if (opt_index < 0) {\r
++      /* diagnostics already printed */\r
++      return 1;\r
++    }\r
++\r
++    if (print_help)\r
+       return notmuch_help_command (NULL, argc - 1, &argv[1]);\r
+ \r
+-    if (strcmp (argv[1], "--version") == 0) {\r
++    if (print_version) {\r
+       printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");\r
+       return 0;\r
+     }\r
+@@ -274,11 +288,11 @@ main (int argc, char *argv[])\r
+     for (i = 0; i < ARRAY_SIZE (commands); i++) {\r
+       command = &commands[i];\r
+ \r
+-      if (strcmp (argv[1], command->name) == 0) {\r
++      if (strcmp (argv[opt_index], command->name) == 0) {\r
+           int ret;\r
+           char *talloc_report;\r
+ \r
+-          ret = (command->function)(local, argc - 1, &argv[1]);\r
++          ret = (command->function)(local, argc - opt_index, argv + opt_index);\r
+ \r
+           /* in the future support for this environment variable may\r
+            * be supplemented or replaced by command line arguments\r
+-- \r
+1.7.10.4\r
+\r