From: Jani Nikula Date: Sun, 3 Mar 2013 21:55:05 +0000 (+0200) Subject: [PATCH v2 1/6] cli: abstract subcommand finding into a new function X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe6d84c45bfdff2c8648bc0f748a05800a35fc97;p=notmuch-archives.git [PATCH v2 1/6] cli: abstract subcommand finding into a new function --- diff --git a/a0/d964f5ca76a7558e6557a44560dd477ec21f05 b/a0/d964f5ca76a7558e6557a44560dd477ec21f05 new file mode 100644 index 000000000..4788e52a5 --- /dev/null +++ b/a0/d964f5ca76a7558e6557a44560dd477ec21f05 @@ -0,0 +1,201 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 64D34431FC7 + for ; Sun, 3 Mar 2013 13:55:22 -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 mKNPant9o1wr for ; + Sun, 3 Mar 2013 13:55:17 -0800 (PST) +Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com + [209.85.217.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 9E3ED431FAF + for ; Sun, 3 Mar 2013 13:55:17 -0800 (PST) +Received: by mail-lb0-f176.google.com with SMTP id s4so3423317lbc.7 + for ; Sun, 03 Mar 2013 13:55:16 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references:in-reply-to:references:x-gm-message-state; + bh=xqu8g7GrmnFPNTesByK6E25F/+SB9aDiPNRFZ89INrk=; + b=gwbKA49TNfzTAfybaXe/8AIJcV21WF8ktSw2dkus0lifOuyEMUbE9Dlgs3vAqaqbqx + 6dJpH26P21wxTmvoZ2oymv0Q7UiM5Gqcv4G8nAWyTymmHgHfC4TPBILdkDqYhtAe37+L + +i53IxEpOjfy45VNOQmd4XYmiOugOAClu/NJpX7VavUSm6IWfovNvfBqHAmDrUMmitw4 + RRkwmrUoEwcSXMXXuy2APHK/dfGNk+KnwH4VlVRrXgVLfcYlSG8ueWvkdt50k/5OfBy8 + oqsSQe76IPp4N8QTlq38hAdykNQ/Yuu9pkVFAtaq+puR0xJPf6jdnZx8U5BOj9Bnc1Xh + Vjmg== +X-Received: by 10.112.88.35 with SMTP id bd3mr3672025lbb.56.1362347716050; + Sun, 03 Mar 2013 13:55:16 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id v7sm6609588lbg.13.2013.03.03.13.55.14 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 03 Mar 2013 13:55:15 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/6] cli: abstract subcommand finding into a new function +Date: Sun, 3 Mar 2013 23:55:05 +0200 +Message-Id: + +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQlKP2nQ68kPj5Dz9xtsnYvtNnHbPBMJY4UK9qVA2nj56Hxl/cwzZoOreqYbRKP+04I+BpwU +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: Sun, 03 Mar 2013 21:55:23 -0000 + +Clean up code. +--- + notmuch.c | 78 +++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 40 insertions(+), 38 deletions(-) + +diff --git a/notmuch.c b/notmuch.c +index cfb009b..3dff6d4 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) { +@@ -247,10 +255,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 }, +@@ -285,39 +294,32 @@ 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); +- +- 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 (argv[opt_index]); ++ if (!command) { ++ fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", ++ argv[opt_index]); ++ 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; + } +-- +1.7.10.4 +