From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E85CA431FC0 for ; Tue, 29 Jan 2013 13:46:51 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4MM6nB70lV-X for ; Tue, 29 Jan 2013 13:46:51 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 43325431FC7 for ; Tue, 29 Jan 2013 13:46:50 -0800 (PST) Received: by mail-la0-f45.google.com with SMTP id er20so647502lab.18 for ; Tue, 29 Jan 2013 13:46:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=4qDQAjZfBxw+vY+TowfikkHP/5T9Zn3JBgUl8IWByd0=; b=LxS8Q186Dv8+exSpgYvTTIxH9pHaTGgrhm3X6ltjeOlbcc2KKkcynb4f4suhIaLnNm CZvf1twbcaXWQjN4tYe84xdwN7GrfraJWEvLnyZ9FFBS0ek7P0gGChbCl1Ajqh1EPNac GuPoUSLJeCnaQhfCvifYVj6HSd/ghQ194qZzKJ9Uqix5azNf1dWCw2xRo9hraiSkDK9z o3p0imkotHoNmEMjQ/fMDeIVsSbkThlXmwCLQqx5AEfnBvwVp52fRqKOhNnA0NQx7i2Z +0gNjHKQRiMB4QPfO4zoq5R6YMUfMQq3FYJKr5OiW7NR2uRLJHqZgWMuFqUBEtCaHRm6 kjiw== X-Received: by 10.112.38.164 with SMTP id h4mr1031947lbk.123.1359496008558; Tue, 29 Jan 2013 13:46:48 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id q4sm5590461lbj.15.2013.01.29.13.46.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 29 Jan 2013 13:46:47 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 3/6] cli: abstract subcommand finding into a new function Date: Tue, 29 Jan 2013 23:46:21 +0200 Message-Id: <4fa07d936647d316f642c8f30b763d316604ea5f.1359495450.git.jani@nikula.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkR3nDUsllGMSZG26Z6cqxy+Q2aboFlmB/+qbEGMNWhm6WpjHM3+3qDTMGsni0AeoOoK5c0 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 21:46:52 -0000 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