From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: [PATCH 3/5] builtin-help: make it possible to exclude some commands in list_commands() Date: Tue, 29 Jul 2008 17:25:01 +0200 Message-ID: <5ad105819efb1c905bd01db3d08eb3422d283b3b.1217344803.git.vmiklos@frugalware.org> References: <5a003a0e20d0942c946680e4eade8e9d19f0036b.1217344803.git.vmiklos@frugalware.org> Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Jul 29 17:26:16 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KNr5J-0001WP-DK for gcvg-git-2@gmane.org; Tue, 29 Jul 2008 17:25:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754005AbYG2PYm (ORCPT ); Tue, 29 Jul 2008 11:24:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753596AbYG2PYk (ORCPT ); Tue, 29 Jul 2008 11:24:40 -0400 Received: from yugo.dsd.sztaki.hu ([195.111.2.114]:46521 "EHLO yugo.frugalware.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753519AbYG2PYh (ORCPT ); Tue, 29 Jul 2008 11:24:37 -0400 Received: from vmobile.example.net (dsl5400FA31.pool.t-online.hu [84.0.250.49]) by yugo.frugalware.org (Postfix) with ESMTP id D32A11DDC5E; Tue, 29 Jul 2008 17:24:34 +0200 (CEST) Received: by vmobile.example.net (Postfix, from userid 1003) id 968CE1AB591; Tue, 29 Jul 2008 17:25:04 +0200 (CEST) X-Mailer: git-send-email 1.6.0.rc0.14.g95f8.dirty In-Reply-To: <5a003a0e20d0942c946680e4eade8e9d19f0036b.1217344803.git.vmiklos@frugalware.org> In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The supposed method is to build a list of commands to be excluded using add_cmdname(), then pass the list as the new exclude parameter. If no exclude is needed, NULL should be used. Signed-off-by: Miklos Vajna --- help.c | 26 +++++++++++--------------- help.h | 14 +++++++++++++- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/help.c b/help.c index 7a42517..858f76a 100644 --- a/help.c +++ b/help.c @@ -9,6 +9,7 @@ #include "common-cmds.h" #include "parse-options.h" #include "run-command.h" +#include "help.h" static struct man_viewer_list { struct man_viewer_list *next; @@ -300,18 +301,11 @@ static inline void mput_char(char c, unsigned int num) putchar(c); } -static struct cmdnames { - int alloc; - int cnt; - struct cmdname { - size_t len; - char name[1]; - } **names; -} main_cmds, other_cmds; +struct cmdnames main_cmds, other_cmds; -static void add_cmdname(struct cmdnames *cmds, const char *name, int len) +void add_cmdname(struct cmdnames *cmds, const char *name, int len) { - struct cmdname *ent = xmalloc(sizeof(*ent) + len); + struct cmdname *ent = xmalloc(sizeof(*ent) + len + 1); ent->len = len; memcpy(ent->name, name, len); @@ -463,7 +457,7 @@ static unsigned int list_commands_in_dir(struct cmdnames *cmds, return longest; } -static unsigned int load_command_list(const char *prefix) +static unsigned int load_command_list(const char *prefix, struct cmdnames *exclude) { unsigned int longest = 0; unsigned int len; @@ -502,13 +496,15 @@ static unsigned int load_command_list(const char *prefix) sizeof(*other_cmds.names), cmdname_compare); uniq(&other_cmds); exclude_cmds(&other_cmds, &main_cmds); + if (exclude) + exclude_cmds(&main_cmds, exclude); return longest; } -void list_commands(const char *prefix, const char *title) +void list_commands(const char *prefix, const char *title, struct cmdnames *exclude) { - unsigned int longest = load_command_list(prefix); + unsigned int longest = load_command_list(prefix, exclude); const char *exec_path = git_exec_path(); if (main_cmds.cnt) { @@ -558,7 +554,7 @@ static int is_in_cmdlist(struct cmdnames *c, const char *s) int is_git_command(const char *s, const char *prefix) { - load_command_list(prefix); + load_command_list(prefix, NULL); return is_in_cmdlist(&main_cmds, s) || is_in_cmdlist(&other_cmds, s); } @@ -704,7 +700,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) if (show_all) { printf("usage: %s\n\n", git_usage_string); - list_commands("git-", "git commands"); + list_commands("git-", "git commands", NULL); printf("%s\n", git_more_info_string); return 0; } diff --git a/help.h b/help.h index 0741662..3eb8cfb 100644 --- a/help.h +++ b/help.h @@ -1,7 +1,19 @@ #ifndef HELP_H #define HELP_H +struct cmdnames { + int alloc; + int cnt; + struct cmdname { + size_t len; + char name[FLEX_ARRAY]; + } **names; +}; + int is_git_command(const char *s, const char *prefix); -void list_commands(const char *prefix, const char *title); +void list_commands(const char *prefix, const char *title, struct cmdnames *exclude); +void add_cmdname(struct cmdnames *cmds, const char *name, int len); + +extern struct cmdnames main_cmds, other_cmds; #endif /* HELP_H */ -- 1.6.0.rc0.14.g95f8.dirty