undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused/unneeded "pattern" argument of list_commands

Browse Source 
list_commands() currently accepts and ignores a "pattern" argument,
and then hard codes a prefix as well as some magic numbers. This
hardcodes the prefix inside of the function and removes the magic
numbers.

Signed-off-by: Scott R Parish <srp@srparish.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Scott R Parish 2007-10-27 01:36:50 -07:00 committed by Junio C Hamano
parent 3d7e2d857a
commit edb6ddc53e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
help.c
View File

@ -93,10 +93,12 @@ static void pretty_print_string_list(struct cmdname **cmdname, int longest)
} }
} }
static void list_commands(const char *exec_path, const char *pattern) static void list_commands(const char *exec_path)
{ {
unsigned int longest = 0; unsigned int longest = 0;
char path[PATH_MAX]; char path[PATH_MAX];
const char *prefix = "git-";
int prefix_len = strlen(prefix);
int dirlen; int dirlen;
DIR *dir = opendir(exec_path); DIR *dir = opendir(exec_path);
struct dirent *de; struct dirent *de;
@ -120,7 +122,7 @@ static void list_commands(const char *exec_path, const char *pattern)
struct stat st; struct stat st;
int entlen; int entlen;
if (prefixcmp(de->d_name, "git-")) if (prefixcmp(de->d_name, prefix))
continue; continue;
strcpy(path+dirlen, de->d_name); strcpy(path+dirlen, de->d_name);
if (stat(path, &st) || /* stat, not lstat */ if (stat(path, &st) || /* stat, not lstat */
@ -128,14 +130,14 @@ static void list_commands(const char *exec_path, const char *pattern)
!(st.st_mode & S_IXUSR)) !(st.st_mode & S_IXUSR))
continue; continue;
entlen = strlen(de->d_name); entlen = strlen(de->d_name) - prefix_len;
if (has_extension(de->d_name, ".exe")) if (has_extension(de->d_name, ".exe"))
entlen -= 4; entlen -= 4;
if (longest < entlen) if (longest < entlen)
longest = entlen; longest = entlen;
add_cmdname(de->d_name + 4, entlen-4); add_cmdname(de->d_name + prefix_len, entlen);
} }
closedir(dir); closedir(dir);
@ -143,7 +145,7 @@ static void list_commands(const char *exec_path, const char *pattern)
printf("----------------------------"); printf("----------------------------");
mput_char('-', strlen(exec_path)); mput_char('-', strlen(exec_path));
putchar('\n'); putchar('\n');
pretty_print_string_list(cmdname, longest - 4); pretty_print_string_list(cmdname, longest);
putchar('\n'); putchar('\n');
} }
@ -209,7 +211,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) { else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) {
printf("usage: %s\n\n", git_usage_string); printf("usage: %s\n\n", git_usage_string);
if(exec_path) if(exec_path)
list_commands(exec_path, "git-*"); list_commands(exec_path);
exit(0); exit(0);
} }