From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 6/6] cli: add top level --config=FILE option
Date: Tue, 29 Jan 2013 23:46:24 +0200 [thread overview]
Message-ID: <231895226338fb6b24eea0ffeef565992822aca8.1359495450.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1359495450.git.jani@nikula.org>
In-Reply-To: <cover.1359495450.git.jani@nikula.org>
Let the user specify the config file on the command line.
---
notmuch.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/notmuch.c b/notmuch.c
index f4bfeaa..71cd0d6 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -258,6 +258,7 @@ main (int argc, char *argv[])
char *talloc_report;
const char *command_name = NULL;
command_t *command;
+ char *config_file_name = NULL;
notmuch_config_t *config;
notmuch_bool_t print_help=FALSE, print_version=FALSE;
int opt_index;
@@ -266,6 +267,7 @@ main (int argc, char *argv[])
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
{ NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
+ { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 },
{ 0, 0, 0, 0, 0 }
};
@@ -303,7 +305,7 @@ main (int argc, char *argv[])
return 1;
}
- config = notmuch_config_open (local, NULL, command->create_config);
+ config = notmuch_config_open (local, config_file_name, command->create_config);
if (!config)
return 1;
--
1.7.10.4
next prev parent reply other threads:[~2013-01-29 21:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-29 21:46 [PATCH 0/6] notmuch cli config changes Jani Nikula
2013-01-29 21:46 ` [PATCH 1/6] cli: keep track of whether the config is newly created Jani Nikula
2013-03-03 16:13 ` David Bremner
2013-01-29 21:46 ` [PATCH 2/6] cli: make notmuch_config_open() "is new" parameter input only Jani Nikula
2013-03-03 16:17 ` David Bremner
2013-01-29 21:46 ` [PATCH 3/6] cli: abstract subcommand finding into a new function Jani Nikula
2013-03-03 16:23 ` David Bremner
2013-01-29 21:46 ` [PATCH 4/6] cli: plug main notmuch command into subcommand machinery Jani Nikula
2013-03-03 16:28 ` David Bremner
2013-01-29 21:46 ` [PATCH 5/6] cli: move config open/close to main() from subcommands Jani Nikula
2013-01-29 21:46 ` Jani Nikula [this message]
2013-03-03 16:32 ` [PATCH 6/6] cli: add top level --config=FILE option David Bremner
2013-02-06 17:50 ` [PATCH 0/6] notmuch cli config changes Jameson Graef Rollins
2013-02-07 7:43 ` Jani Nikula
2013-02-07 12:07 ` David Bremner
2013-02-12 7:50 ` Jameson Graef Rollins
2013-02-12 11:42 ` David Bremner
2013-02-12 16:54 ` Jameson Graef Rollins
2013-02-12 18:53 ` David Bremner
2013-02-13 7:51 ` Mark Walters
2013-02-12 20:06 ` Jani Nikula
2013-03-03 16:36 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=231895226338fb6b24eea0ffeef565992822aca8.1359495450.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).