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." },
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;
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");
* 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;
{
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;
/* 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 */
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;
}