Skip to content

Commit

Permalink
remove unused/unneeded "pattern" argument of list_commands
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Scott R Parish authored and Junio C Hamano committed Oct 30, 2007
1 parent 3d7e2d8 commit edb6ddc
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions help.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
char path[PATH_MAX];
const char *prefix = "git-";
int prefix_len = strlen(prefix);
int dirlen;
DIR *dir = opendir(exec_path);
struct dirent *de;
Expand All @@ -120,30 +122,30 @@ static void list_commands(const char *exec_path, const char *pattern)
struct stat st;
int entlen;

if (prefixcmp(de->d_name, "git-"))
if (prefixcmp(de->d_name, prefix))
continue;
strcpy(path+dirlen, de->d_name);
if (stat(path, &st) || /* stat, not lstat */
!S_ISREG(st.st_mode) ||
!(st.st_mode & S_IXUSR))
continue;

entlen = strlen(de->d_name);
entlen = strlen(de->d_name) - prefix_len;
if (has_extension(de->d_name, ".exe"))
entlen -= 4;

if (longest < entlen)
longest = entlen;

add_cmdname(de->d_name + 4, entlen-4);
add_cmdname(de->d_name + prefix_len, entlen);
}
closedir(dir);

printf("git commands available in '%s'\n", exec_path);
printf("----------------------------");
mput_char('-', strlen(exec_path));
putchar('\n');
pretty_print_string_list(cmdname, longest - 4);
pretty_print_string_list(cmdname, longest);
putchar('\n');
}

Expand Down Expand Up @@ -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")) {
printf("usage: %s\n\n", git_usage_string);
if(exec_path)
list_commands(exec_path, "git-*");
list_commands(exec_path);
exit(0);
}

Expand Down

0 comments on commit edb6ddc

Please sign in to comment.