cli: abstract subcommand finding into a new function

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index 4fc0973d3715ddd6a967d0c16f8f188b7f951c51..3dff6d46606b1c8e3e4e7e5353c2213438694adc 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -31,18 +31,6 @@ typedef struct command {
     const char *summary;
 } command_t;
 
-#define MAX_ALIAS_SUBSTITUTIONS 3
-
-typedef struct alias {
-    const char *name;
-    const char *substitutions[MAX_ALIAS_SUBSTITUTIONS];
-} alias_t;
-
-alias_t aliases[] = {
-    { "part", { "show", "--format=raw"}},
-    { "search-tags", {"search", "--output=tags", "*"}}
-};
-
 static int
 notmuch_help_command (void *ctx, int argc, char *argv[]);
 
@@ -82,6 +70,18 @@ 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 (strcmp (name, commands[i].name) == 0)
+           return &commands[i];
+
+    return NULL;
+}
+
 int notmuch_format_version;
 
 static void
@@ -151,7 +151,6 @@ static int
 notmuch_help_command (void *ctx, int argc, char *argv[])
 {
     command_t *command;
-    unsigned int i;
 
     argc--; argv++; /* Ignore "help" */
 
@@ -170,13 +169,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) {
@@ -259,10 +255,17 @@ int
 main (int argc, char *argv[])
 {
     void *local;
+    char *talloc_report;
     command_t *command;
-    alias_t *alias;
-    unsigned int i, j;
-    const char **argv_local;
+    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 },
+       { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
+       { 0, 0, 0, 0, 0 }
+    };
 
     talloc_enable_null_tracking ();
 
@@ -277,79 +280,46 @@ main (int argc, char *argv[])
     if (argc == 1)
        return notmuch (local);
 
-    if (strcmp (argv[1], "--help") == 0)
+    opt_index = parse_arguments (argc, argv, options, 1);
+    if (opt_index < 0) {
+       /* diagnostics already printed */
+       return 1;
+    }
+
+    if (print_help)
        return notmuch_help_command (NULL, argc - 1, &argv[1]);
 
-    if (strcmp (argv[1], "--version") == 0) {
+    if (print_version) {
        printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");
        return 0;
     }
 
-    for (i = 0; i < ARRAY_SIZE (aliases); i++) {
-       alias = &aliases[i];
-
-       if (strcmp (argv[1], alias->name) == 0)
-       {
-           int substitutions;
-
-           argv_local = talloc_size (local, sizeof (char *) *
-                                     (argc + MAX_ALIAS_SUBSTITUTIONS - 1));
-           if (argv_local == NULL) {
-               fprintf (stderr, "Out of memory.\n");
-               return 1;
-           }
-
-           /* Copy all substution arguments from the alias. */
-           argv_local[0] = argv[0];
-           for (j = 0; j < MAX_ALIAS_SUBSTITUTIONS; j++) {
-               if (alias->substitutions[j] == NULL)
-                   break;
-               argv_local[j+1] = alias->substitutions[j];
-           }
-           substitutions = j;
-
-           /* And copy all original arguments (skipping the argument
-            * that matched the alias of course. */
-           for (j = 2; j < (unsigned) argc; j++) {
-               argv_local[substitutions+j-1] = argv[j];
-           }
-
-           argc += substitutions - 1;
-           argv = (char **) argv_local;
-       }
+    command = find_command (argv[opt_index]);
+    if (!command) {
+       fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+                argv[opt_index]);
+       return 1;
     }
 
-    for (i = 0; i < ARRAY_SIZE (commands); i++) {
-       command = &commands[i];
-
-       if (strcmp (argv[1], command->name) == 0) {
-           int ret;
-           char *talloc_report;
-
-           ret = (command->function)(local, argc - 1, &argv[1]);
-
-           /* in the future support for this environment variable may
-            * be supplemented or replaced by command line arguments
-            * --leak-report and/or --leak-report-full */
-
-           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");
-               talloc_report_full (NULL, report);
-           }
-
-           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;
 }