cli: plug main notmuch command into subcommand machinery

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index cfb009ba5036eeff5235dc4b792d4bbeb2133f5f..ec2f20fa45713fd92c5564fa869a10f3e6b7c40f 100644 (file)
--- 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." },
@@ -70,6 +76,19 @@ static command_t commands[] = {
       "This message, or more detailed help for the named command." }
 };
 
+static command_t *
+find_command (const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_SIZE (commands); i++)
+       if ((!name && !commands[i].name) ||
+           (name && commands[i].name && strcmp (name, commands[i].name) == 0))
+           return &commands[i];
+
+    return NULL;
+}
+
 int notmuch_format_version;
 
 static void
@@ -89,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");
@@ -139,7 +158,6 @@ static int
 notmuch_help_command (void *ctx, int argc, char *argv[])
 {
     command_t *command;
-    unsigned int i;
 
     argc--; argv++; /* Ignore "help" */
 
@@ -158,13 +176,10 @@ notmuch_help_command (void *ctx, int argc, char *argv[])
        return 0;
     }
 
-    for (i = 0; i < ARRAY_SIZE (commands); i++) {
-       command = &commands[i];
-
-       if (strcmp (argv[0], command->name) == 0) {
-           char *page = talloc_asprintf (ctx, "notmuch-%s", command->name);
-           exec_man (page);
-       }
+    command = find_command (argv[0]);
+    if (command) {
+       char *page = talloc_asprintf (ctx, "notmuch-%s", command->name);
+       exec_man (page);
     }
 
     if (strcmp (argv[0], "search-terms") == 0) {
@@ -184,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;
@@ -247,10 +262,12 @@ int
 main (int argc, char *argv[])
 {
     void *local;
+    char *talloc_report;
+    const char *command_name = NULL;
     command_t *command;
-    unsigned int i;
     notmuch_bool_t print_help=FALSE, print_version=FALSE;
     int opt_index;
+    int ret = 0;
 
     notmuch_opt_desc_t options[] = {
        { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
@@ -268,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 */
@@ -285,39 +299,35 @@ main (int argc, char *argv[])
        return 0;
     }
 
-    for (i = 0; i < ARRAY_SIZE (commands); i++) {
-       command = &commands[i];
-
-       if (strcmp (argv[opt_index], command->name) == 0) {
-           int ret;
-           char *talloc_report;
-
-           ret = (command->function)(local, argc - opt_index, argv + opt_index);
+    if (opt_index < argc)
+       command_name = argv[opt_index];
 
-           talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
-
-           /* this relies on the previous call to
-            * talloc_enable_null_tracking */
-
-           if (talloc_report && strcmp (talloc_report, "") != 0) {
-               FILE *report = fopen (talloc_report, "w");
-               if (report) {
-                   talloc_report_full (NULL, report);
-               } else {
-                   ret = 1;
-                   fprintf (stderr, "ERROR: unable to write talloc log. ");
-                   perror (talloc_report);
-               }
-           }
+    command = find_command (command_name);
+    if (!command) {
+       fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+                command_name);
+       return 1;
+    }
 
-           return ret;
+    ret = (command->function)(local, argc - opt_index, argv + opt_index);
+
+    talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
+    if (talloc_report && strcmp (talloc_report, "") != 0) {
+       /* this relies on the previous call to
+        * talloc_enable_null_tracking
+        */
+
+       FILE *report = fopen (talloc_report, "w");
+       if (report) {
+           talloc_report_full (NULL, report);
+       } else {
+           ret = 1;
+           fprintf (stderr, "ERROR: unable to write talloc log. ");
+           perror (talloc_report);
        }
     }
 
-    fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
-            argv[1]);
-
     talloc_free (local);
 
-    return 1;
+    return ret;
 }