From 643bdda1c1fa1c025a6b4176178918a71c4ea16a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 6 Apr 2015 21:22:36 +0900 Subject: [PATCH] [Patch v2 2/4] cli: refactor notmuch_help_command --- f4/e01654d8cb23a8670debf3c451dd0df02192c3 | 128 ++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 f4/e01654d8cb23a8670debf3c451dd0df02192c3 diff --git a/f4/e01654d8cb23a8670debf3c451dd0df02192c3 b/f4/e01654d8cb23a8670debf3c451dd0df02192c3 new file mode 100644 index 000000000..173772641 --- /dev/null +++ b/f4/e01654d8cb23a8670debf3c451dd0df02192c3 @@ -0,0 +1,128 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 2B14F6DE1AFC + for ; Mon, 6 Apr 2015 05:24:46 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.46 +X-Spam-Level: +X-Spam-Status: No, score=0.46 tagged_above=-999 required=5 tests=[AWL=0.450, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id D-_Q_fqURhnW for ; + Mon, 6 Apr 2015 05:24:44 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 668A26DE1AE1 + for ; Mon, 6 Apr 2015 05:24:44 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1Yf64Q-00059E-KI; Mon, 06 Apr 2015 12:24:02 +0000 +Received: (nullmailer pid 3282 invoked by uid 1000); Mon, 06 Apr 2015 + 12:22:58 -0000 +From: David Bremner +To: David Bremner , notmuch@notmuchmail.org +Subject: [Patch v2 2/4] cli: refactor notmuch_help_command +Date: Mon, 6 Apr 2015 21:22:36 +0900 +Message-Id: <1428322958-2887-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1428322958-2887-1-git-send-email-david@tethera.net> +References: <87d23ixnr7.fsf@maritornes.cs.unb.ca> + <1428322958-2887-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Mon, 06 Apr 2015 12:24:46 -0000 + +Create a new private entry point _help_for so that we can call help +without simulating a command line invokation to set up the arguments. +--- + notmuch.c | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/notmuch.c b/notmuch.c +index 31672c3..bff941f 100644 +--- a/notmuch.c ++++ b/notmuch.c +@@ -177,21 +177,19 @@ exec_man (const char *page) + } + + static int +-notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[]) ++_help_for (const char *topic_name) + { + command_t *command; + help_topic_t *topic; + unsigned int i; + +- argc--; argv++; /* Ignore "help" */ +- +- if (argc == 0) { ++ if (!topic_name) { + printf ("The notmuch mail system.\n\n"); + usage (stdout); + return EXIT_SUCCESS; + } + +- if (strcmp (argv[0], "help") == 0) { ++ if (strcmp (topic_name, "help") == 0) { + printf ("The notmuch help system.\n\n" + "\tNotmuch uses the man command to display help. In case\n" + "\tof difficulties check that MANPATH includes the pages\n" +@@ -200,7 +198,7 @@ notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[] + return EXIT_SUCCESS; + } + +- command = find_command (argv[0]); ++ command = find_command (topic_name); + if (command) { + char *page = talloc_asprintf (NULL, "notmuch-%s", command->name); + exec_man (page); +@@ -208,7 +206,7 @@ notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[] + + for (i = 0; i < ARRAY_SIZE (help_topics); i++) { + topic = &help_topics[i]; +- if (strcmp (argv[0], topic->name) == 0) { ++ if (strcmp (topic_name, topic->name) == 0) { + char *page = talloc_asprintf (NULL, "notmuch-%s", topic->name); + exec_man (page); + } +@@ -216,10 +214,22 @@ notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[] + + fprintf (stderr, + "\nSorry, %s is not a known command. There's not much I can do to help.\n\n", +- argv[0]); ++ topic_name); + return EXIT_FAILURE; + } + ++static int ++notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[]) ++{ ++ argc--; argv++; /* Ignore "help" */ ++ ++ if (argc == 0) { ++ return _help_for (NULL); ++ } ++ ++ return _help_for (argv[0]); ++} ++ + /* Handle the case of "notmuch" being invoked with no command + * argument. For now we just call notmuch_setup_command, but we plan + * to be more clever about this in the future. +-- +2.1.4 + -- 2.26.2