diff options
author | Scott R Parish <srp@srparish.net> | 2007-10-27 01:36:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-10-29 20:51:37 -0700 |
commit | 0966003c8e8d1528912b10667b903cd981e3a7f6 (patch) | |
tree | 01f838f8d9e826d850b14d35d4b496aca86d9d23 /help.c | |
parent | 384df83312d24ea4d11adcf4e73921fc192595d2 (diff) | |
download | git-0966003c8e8d1528912b10667b903cd981e3a7f6.tar.gz git-0966003c8e8d1528912b10667b903cd981e3a7f6.tar.xz |
list_commands(): simplify code by using chdir()
The current code builds absolute path strings for each file to
stat(), this can easily be avoided by chdir()ing into the directory.
Signed-off-by: Scott R Parish <srp@srparish.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'help.c')
-rw-r--r-- | help.c | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -96,36 +96,24 @@ static void pretty_print_string_list(struct cmdname **cmdname, int longest) 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; - if (!dir) { + if (!dir || chdir(exec_path)) { fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno)); exit(1); } - dirlen = strlen(exec_path); - if (PATH_MAX - 20 < dirlen) { - fprintf(stderr, "git: insanely long exec-path '%s'\n", - exec_path); - exit(1); - } - - memcpy(path, exec_path, dirlen); - path[dirlen++] = '/'; - while ((de = readdir(dir)) != NULL) { struct stat st; int entlen; if (prefixcmp(de->d_name, prefix)) continue; - strcpy(path+dirlen, de->d_name); - if (stat(path, &st) || /* stat, not lstat */ + + if (stat(de->d_name, &st) || /* stat, not lstat */ !S_ISREG(st.st_mode) || !(st.st_mode & S_IXUSR)) continue; |