From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 2/6] cli: plug main notmuch command into subcommand machinery
Date: Sun, 3 Mar 2013 23:55:06 +0200 [thread overview]
Message-ID: <bf81d217ceefc512a252a5acccd3c62b185eb874.1362347362.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1362347362.git.jani@nikula.org>
In-Reply-To: <cover.1362347362.git.jani@nikula.org>
This allows top level arguments to be added to notmuch in a way that
doesn't require special handling for the plain notmuch command without
a subcommand.
---
notmuch.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/notmuch.c b/notmuch.c
index 3dff6d4..ec2f20f 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -34,7 +34,13 @@ typedef struct command {
static int
notmuch_help_command (void *ctx, int argc, char *argv[]);
+static int
+notmuch_command (void *ctx, int argc, char *argv[]);
+
static command_t commands[] = {
+ { NULL, notmuch_command,
+ NULL,
+ "Notmuch main command." },
{ "setup", notmuch_setup_command,
NULL,
"Interactively setup notmuch for first use." },
@@ -76,7 +82,8 @@ find_command (const char *name)
size_t i;
for (i = 0; i < ARRAY_SIZE (commands); i++)
- if (strcmp (name, commands[i].name) == 0)
+ if ((!name && !commands[i].name) ||
+ (name && commands[i].name && strcmp (name, commands[i].name) == 0))
return &commands[i];
return NULL;
@@ -101,8 +108,8 @@ usage (FILE *out)
for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i];
- fprintf (out, " %-11s %s\n",
- command->name, command->summary);
+ if (command->name)
+ fprintf (out, " %-11s %s\n", command->name, command->summary);
}
fprintf (out, "\n");
@@ -192,7 +199,7 @@ notmuch_help_command (void *ctx, int argc, char *argv[])
* to be more clever about this in the future.
*/
static int
-notmuch (void *ctx)
+notmuch_command (void *ctx, unused(int argc), unused(char *argv[]))
{
notmuch_config_t *config;
notmuch_bool_t is_new;
@@ -256,6 +263,7 @@ main (int argc, char *argv[])
{
void *local;
char *talloc_report;
+ const char *command_name = NULL;
command_t *command;
notmuch_bool_t print_help=FALSE, print_version=FALSE;
int opt_index;
@@ -277,9 +285,6 @@ main (int argc, char *argv[])
/* Globally default to the current output format version. */
notmuch_format_version = NOTMUCH_FORMAT_CUR;
- if (argc == 1)
- return notmuch (local);
-
opt_index = parse_arguments (argc, argv, options, 1);
if (opt_index < 0) {
/* diagnostics already printed */
@@ -294,10 +299,13 @@ main (int argc, char *argv[])
return 0;
}
- command = find_command (argv[opt_index]);
+ if (opt_index < argc)
+ command_name = argv[opt_index];
+
+ command = find_command (command_name);
if (!command) {
fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
- argv[opt_index]);
+ command_name);
return 1;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-03-03 21:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 21:55 [PATCH v2 0/6] notmuch cli config changes Jani Nikula
2013-03-03 21:55 ` [PATCH v2 1/6] cli: abstract subcommand finding into a new function Jani Nikula
2013-03-03 21:55 ` Jani Nikula [this message]
2013-03-03 21:55 ` [PATCH v2 3/6] cli: config: keep track of whether the config is newly created Jani Nikula
2013-03-03 21:55 ` [PATCH v2 4/6] cli: config: make notmuch_config_open() "is new" parameter input only Jani Nikula
2013-03-07 13:44 ` David Bremner
2013-03-07 14:38 ` Tomi Ollila
2013-03-03 21:55 ` [PATCH v2 5/6] cli: move config open/close to main() from subcommands Jani Nikula
2013-03-08 12:05 ` David Bremner
2013-03-03 21:55 ` [PATCH v2 6/6] cli: add top level --config=FILE option Jani Nikula
2013-03-04 19:53 ` [PATCH] man: document the notmuch --config=FILE global option Jani Nikula
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=bf81d217ceefc512a252a5acccd3c62b185eb874.1362347362.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).