From: David Bremner <david@tethera.net>
To: Mark Walters <markwalters1009@gmail.com>,
David Bremner <david@tethera.net>,
notmuch@notmuchmail.org
Subject: [PATCH 4/4] cli: add standard option processing to config, help and setup
Date: Wed, 8 Apr 2015 04:30:42 +0900 [thread overview]
Message-ID: <1428435042-16503-5-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1428435042-16503-1-git-send-email-david@tethera.net>
In particular this fixes a recently encountered bug where the
"--config" argument to "notmuch setup" is silently ignored, which the
unpleasant consequence of overwriting the users config file.
---
notmuch-client.h | 2 ++
notmuch-config.c | 9 ++++++++-
notmuch-setup.c | 3 +++
notmuch.c | 32 +++++++++++++++++++++++++++++++-
test/random-corpus.c | 9 +++++++++
5 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index 8ecfac6..78680aa 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -468,4 +468,6 @@ notmuch_database_dump (notmuch_database_t *notmuch,
#include "command-line-arguments.h"
extern const notmuch_opt_desc_t notmuch_shared_options [];
void notmuch_process_shared_options (const char* subcommand_name);
+int notmuch_minimal_options (const char* subcommand_name,
+ int argc, char **argv);
#endif
diff --git a/notmuch-config.c b/notmuch-config.c
index 2d5c297..9348278 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -872,8 +872,15 @@ int
notmuch_config_command (notmuch_config_t *config, int argc, char *argv[])
{
int ret;
+ int opt_index;
- argc--; argv++; /* skip subcommand argument */
+ opt_index = notmuch_minimal_options ("config", argc, argv);
+ if (opt_index < 0)
+ return EXIT_FAILURE;
+
+ /* skip at least subcommand argument */
+ argc-= opt_index;
+ argv+= opt_index;
if (argc < 1) {
fprintf (stderr, "Error: notmuch config requires at least one argument.\n");
diff --git a/notmuch-setup.c b/notmuch-setup.c
index 36a6171..7dd5822 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -145,6 +145,9 @@ notmuch_setup_command (notmuch_config_t *config,
chomp_newline (response); \
} while (0)
+ if (notmuch_minimal_options ("setup", argc, argv) < 0)
+ return EXIT_FAILURE;
+
if (notmuch_config_is_new (config))
welcome_message_pre_setup ();
diff --git a/notmuch.c b/notmuch.c
index 3a9da90..2198b73 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -71,6 +71,28 @@ notmuch_process_shared_options (const char *subcommand_name) {
}
}
+/* This is suitable for subcommands that do not actually open the
+ * database.
+ */
+int notmuch_minimal_options (const char *subcommand_name,
+ int argc, char **argv)
+{
+ int opt_index;
+
+ notmuch_opt_desc_t options[] = {
+ { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },
+ { 0, 0, 0, 0, 0 }
+ };
+
+ opt_index = parse_arguments (argc, argv, options, 1);
+
+ if (opt_index < 0)
+ return -1;
+
+ /* We can't use argv here as it is sometimes NULL */
+ notmuch_process_shared_options (subcommand_name);
+ return opt_index;
+}
static command_t commands[] = {
{ NULL, notmuch_command, TRUE,
@@ -250,7 +272,15 @@ _help_for (const char *topic_name)
static int
notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[])
{
- argc--; argv++; /* Ignore "help" */
+ int opt_index;
+
+ opt_index = notmuch_minimal_options ("help", argc, argv);
+ if (opt_index < 0)
+ return EXIT_FAILURE;
+
+ /* skip at least subcommand argument */
+ argc-= opt_index;
+ argv+= opt_index;
if (argc == 0) {
return _help_for (NULL);
diff --git a/test/random-corpus.c b/test/random-corpus.c
index 790193d..6c467bb 100644
--- a/test/random-corpus.c
+++ b/test/random-corpus.c
@@ -114,6 +114,15 @@ random_utf8_string (void *ctx, size_t char_count)
return buf;
}
+/* stubs since we cannot link with notmuch.o */
+const notmuch_opt_desc_t notmuch_shared_options[] = {
+ { 0, 0, 0, 0, 0 }
+};
+
+void
+notmuch_process_shared_options (unused (const char *dummy))
+{
+}
int
main (int argc, char **argv)
--
2.1.4
next prev parent reply other threads:[~2015-04-07 19:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 20:59 argument parsing refactor, add shared options David Bremner
2015-04-05 20:59 ` [PATCH 1/4] cli: ignore config argument of notmuch_help_command David Bremner
2015-04-05 20:59 ` [PATCH 2/4] cli: refactor notmuch_help_command David Bremner
2015-04-05 20:59 ` [PATCH 3/4] cli: define shared options, use for --help and --version David Bremner
2015-04-05 20:59 ` [PATCH 4/4] cli: add standard option processing to config and setup David Bremner
2015-04-05 21:34 ` David Bremner
2015-04-06 12:22 ` argument parsing refactoring, round 2 David Bremner
2015-04-06 12:22 ` [Patch v2 1/4] cli: ignore config argument of notmuch_help_command David Bremner
2015-04-06 12:22 ` [Patch v2 2/4] cli: refactor notmuch_help_command David Bremner
2015-04-06 12:22 ` [Patch v2 3/4] cli: define shared options, use for --help and --version David Bremner
2015-04-07 7:22 ` Mark Walters
2015-04-06 12:22 ` [Patch v2 4/4] cli: add standard option processing to config and setup David Bremner
2015-04-07 7:24 ` Mark Walters
2015-04-07 10:20 ` David Bremner
2015-04-07 7:19 ` argument parsing refactoring, round 2 Mark Walters
2015-04-07 19:30 ` argument parsing refactoring round3 David Bremner
2015-04-07 19:30 ` [PATCH 1/4] cli: ignore config argument of notmuch_help_command David Bremner
2015-04-07 19:30 ` [PATCH 2/4] cli: refactor notmuch_help_command David Bremner
2015-04-07 19:30 ` [PATCH 3/4] cli: define shared options, use for --help and --version David Bremner
2015-04-07 19:30 ` David Bremner [this message]
2015-04-08 14:14 ` [PATCH] fixup! cli: add standard option processing to config, help and setup David Bremner
2015-04-08 14:31 ` argument parsing refactoring round3 guyzmo
2015-04-08 23:53 ` David Bremner
2015-04-11 0:01 ` David Bremner
2015-04-25 19:56 ` Tomi Ollila
2015-06-02 4:43 ` 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=1428435042-16503-5-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=markwalters1009@gmail.com \
--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).