[RFC PATCH 1/2] cli: add support for global options that get passed to sub-commands

diff --git a/60/d7471f8e64dc20a4f9448faf8aad086e3d019b b/60/d7471f8e64dc20a4f9448faf8aad086e3d019b
new file mode 100644 (file)
index 0000000..dff59ab
--- /dev/null
+++ b/60/d7471f8e64dc20a4f9448faf8aad086e3d019b
@@ -0,0 +1,183 @@
+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 92D5642114C\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Aug 2013 23:12:02 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 as0yIQl0xuyV for <notmuch@notmuchmail.org>;\r
+       Sat, 31 Aug 2013 23:11:55 -0700 (PDT)\r
+Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
+ [74.125.83.49])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 9138B4092A1   for <notmuch@notmuchmail.org>; Sat, 31 Aug 2013 03:34:34 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f49.google.com with SMTP id d41so1357926eek.22\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Aug 2013 03:34:33 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=9GgMlPzsIeZ0/remkd5X4LIyibKDBPYYIr/ucCmWp9k=;\r
+       b=GH0V1OH0JcJUg7Y7OnYk91sZufBIHXu77wxe/7bZv/MmvlaGA2KEJbaquG36V+ffTd\r
+       PtpezAVUNv+B0CdxiFASKi61OyoFiWmBGUvpNjGKM8Epu1SlLziSbBMTfnifvubeo3os\r
+       B0qvu0NtQKHfS2082mCHLGf3cO5j0vT/jDW5I9MQvvUQ+GuTg0tmRZHhis2j3t+S3JdE\r
+       IM6Hy63P6IW9YVobvXKv+Btt/QJ8zhFi+qLFWrz7QFPKUIZlUAdOGvOOx7MH3hOPd8CC\r
+       4dJnCLoDmXxaDfzWm+gppvN8j6sAbUq/iVoyiRnf+GYG7cwot7SjlO/XBG4BDR+sbZwa\r
+       lLtw==\r
+X-Gm-Message-State:\r
+ ALoCoQl/J+RIln6oP4/RTHYXAj0KTvap2hAYeZvq4qksP/yenVfXVH13zFDcUx08csFsq88pS/pb\r
+X-Received: by 10.15.26.7 with SMTP id m7mr2355856eeu.56.1377945272020;\r
+       Sat, 31 Aug 2013 03:34:32 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id r48sm4021354eev.14.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 31 Aug 2013 03:34:31 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH 1/2] cli: add support for global options that get passed\r
+       to sub-commands\r
+Date: Sat, 31 Aug 2013 13:34:30 +0300\r
+Message-Id:\r
+ <08036456064699510ef832f0c6740d98d324d185.1377945239.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\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: Sun, 01 Sep 2013 06:12:02 -0000\r
+\r
+This allows sub-commands to have access to global options.\r
+---\r
+ notmuch-client.h |   21 +++++++++++++++++++++\r
+ notmuch-config.c |   29 +++++++++++++++++++++++++++++\r
+ notmuch.c        |   10 ++++++++++\r
+ 3 files changed, 60 insertions(+)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index afb0ddf..5656426 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -320,6 +320,27 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config,\r
+                                     const char *list[],\r
+                                     size_t length);\r
+ \r
++/* global options */\r
++typedef struct _notmuch_global_options {\r
++    notmuch_bool_t debug;\r
++    notmuch_bool_t verbose;\r
++    notmuch_bool_t no_hooks;\r
++} notmuch_global_options_t;\r
++\r
++void\r
++notmuch_global_set (notmuch_config_t *config,\r
++                  const notmuch_global_options_t *global_options);\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_debug (notmuch_config_t *config);\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_verbose (notmuch_config_t *config);\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_no_hooks (notmuch_config_t *config);\r
++\r
++\r
+ int\r
+ notmuch_run_hook (const char *db_path, const char *hook);\r
+ \r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index 6845e3c..4cb29eb 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -118,6 +118,9 @@ struct _notmuch_config {\r
+     notmuch_bool_t maildir_synchronize_flags;\r
+     const char **search_exclude_tags;\r
+     size_t search_exclude_tags_length;\r
++\r
++    /* global options */\r
++    notmuch_global_options_t global_options;\r
+ };\r
+ \r
+ static int\r
+@@ -883,3 +886,29 @@ notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,\r
+                           "maildir", "synchronize_flags", synchronize_flags);\r
+     config->maildir_synchronize_flags = synchronize_flags;\r
+ }\r
++\r
++/* global options */\r
++void\r
++notmuch_global_set (notmuch_config_t *config,\r
++                  const notmuch_global_options_t *global_options)\r
++{\r
++    config->global_options = *global_options;\r
++}\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_debug (notmuch_config_t *config)\r
++{\r
++    return config->global_options.debug;\r
++}\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_verbose (notmuch_config_t *config)\r
++{\r
++    return config->global_options.verbose;\r
++}\r
++\r
++notmuch_bool_t\r
++notmuch_global_get_no_hooks (notmuch_config_t *config)\r
++{\r
++    return config->global_options.no_hooks;\r
++}\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 78d29a8..11cdfd7 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -252,11 +252,19 @@ main (int argc, char *argv[])\r
+     notmuch_bool_t print_help=FALSE, print_version=FALSE;\r
+     int opt_index;\r
+     int ret = 0;\r
++    notmuch_global_options_t global_options = {\r
++      .debug = FALSE,\r
++      .verbose = FALSE,\r
++      .no_hooks = FALSE,\r
++    };\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
+       { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &global_options.debug, "debug", 'd', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &global_options.verbose, "verbose", 'V', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &global_options.no_hooks, "no-hooks", 'N', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -300,6 +308,8 @@ main (int argc, char *argv[])\r
+     if (!config)\r
+       return 1;\r
+ \r
++    notmuch_global_set (config, &global_options);\r
++\r
+     ret = (command->function)(config, argc - opt_index, argv + opt_index);\r
+ \r
+     notmuch_config_close (config);\r
+-- \r
+1.7.10.4\r
+\r