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