[PATCH v2 6/6] cli: add top level --config=FILE option

diff --git a/48/20a3cba2984389a643898a3494a30223672a6a b/48/20a3cba2984389a643898a3494a30223672a6a
new file mode 100644 (file)
index 0000000..f8e53bf
--- /dev/null
+++ b/48/20a3cba2984389a643898a3494a30223672a6a
@@ -0,0 +1,106 @@
+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 7CACE431FC7\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 13:55:50 -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 CiQXr3mL2ws4 for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Mar 2013 13:55:50 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9AB42429E33\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Mar 2013 13:55:32 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id gm6so3413461lbb.26\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Mar 2013 13:55:29 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references:in-reply-to:references:x-gm-message-state;\r
+       bh=gc4zUH5wI6IzenxhDROcBrfY2sMFRXwZtQckaJyV+A0=;\r
+       b=E35GF0Tx5yFCNHlMfQirowSwnE8KAPdPAWeQ9XuQ8C5o7NDqzQDAlJ2yBWAKCXQFa/\r
+       h3oP9p3lMEHZkEHptBiuhbfjlDnSQ42mwSe7nuA+5Bv0ua43yIvThYOT/Rl+fM9Dg03g\r
+       yrmoQQ8JV737DOMtMPArNUIlFwsy79WzSd5GgXRUgJFzHVz9/WqH6ZVLPGQ7xlQzEuga\r
+       LFsv7bx/7K5JvnSDlUaUHsMBmjD1EF8kvQWl9t9puwZrgxk4x6QGZ5KWQDp9OVZiZNDL\r
+       DZkxACCrbbVQ4mKGuA5thp8ne65XRQaGmRMBa4xg0xbC57DNYH6rmVcRlurCZET6/9/c\r
+       d45Q==\r
+X-Received: by 10.112.50.169 with SMTP id d9mr3603525lbo.57.1362347729653;\r
+       Sun, 03 Mar 2013 13:55:29 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id pk1sm10735446lab.0.2013.03.03.13.55.28\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 03 Mar 2013 13:55:28 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/6] cli: add top level --config=FILE option\r
+Date: Sun,  3 Mar 2013 23:55:10 +0200\r
+Message-Id:\r
+ <8e1f0e7ba278219d54a3177a50fe84dc8755db6d.1362347362.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1362347362.git.jani@nikula.org>\r
+References: <cover.1362347362.git.jani@nikula.org>\r
+In-Reply-To: <cover.1362347362.git.jani@nikula.org>\r
+References: <cover.1362347362.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQm0UJpmj62D6s0JX6lJ+qvRZg6b7gA1FnEW8y+gxbZrzW5ibBebebHOIORSX3wXkzhsy9lf\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, 03 Mar 2013 21:55:50 -0000\r
+\r
+Let the user specify the config file on the command line.\r
+---\r
+ notmuch.c |    4 +++-\r
+ 1 file changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 3241e23..f51a84f 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -258,6 +258,7 @@ main (int argc, char *argv[])\r
+     char *talloc_report;\r
+     const char *command_name = NULL;\r
+     command_t *command;\r
++    char *config_file_name = NULL;\r
+     notmuch_config_t *config;\r
+     notmuch_bool_t print_help=FALSE, print_version=FALSE;\r
+     int opt_index;\r
+@@ -266,6 +267,7 @@ main (int argc, char *argv[])\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
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -303,7 +305,7 @@ main (int argc, char *argv[])\r
+       return 1;\r
+     }\r
+ \r
+-    config = notmuch_config_open (local, NULL, command->create_config);\r
++    config = notmuch_config_open (local, config_file_name, command->create_config);\r
+     if (!config)\r
+       return 1;\r
+ \r
+-- \r
+1.7.10.4\r
+\r