[PATCH 3/6] cli: abstract subcommand finding into a new function
Jani Nikula
jani at nikula.org
Tue Jan 29 13:46:21 PST 2013
Clean up code.
---
notmuch.c | 68 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/notmuch.c b/notmuch.c
index b413b53..c47b998 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -70,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
@@ -139,7 +151,6 @@ static int
notmuch_help_command (void *ctx, int argc, char *argv[])
{
command_t *command;
- unsigned int i;
argc--; argv++; /* Ignore "help" */
@@ -158,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) {
@@ -246,10 +254,11 @@ int
main (int argc, char *argv[])
{
void *local;
+ char *talloc_report;
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 },
@@ -284,37 +293,30 @@ 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);
+ command = find_command (argv[opt_index]);
+ if (!command) {
+ fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+ argv[opt_index]);
+ return 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 */
+ ret = (command->function)(local, argc - opt_index, argv + opt_index);
- talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
+ /* in the future support for this environment variable may
+ * be supplemented or replaced by command line arguments
+ * --leak-report and/or --leak-report-full */
- /* this relies on the previous call to
- * talloc_enable_null_tracking */
+ talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
- if (talloc_report && strcmp (talloc_report, "") != 0) {
- FILE *report = fopen (talloc_report, "w");
- talloc_report_full (NULL, report);
- }
+ /* this relies on the previous call to
+ * talloc_enable_null_tracking */
- return ret;
- }
+ if (talloc_report && strcmp (talloc_report, "") != 0) {
+ FILE *report = fopen (talloc_report, "w");
+ talloc_report_full (NULL, report);
}
- fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
- argv[1]);
-
talloc_free (local);
- return 1;
+ return ret;
}
--
1.7.10.4
More information about the notmuch
mailing list