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

list_commands(): simplify code by using chdir()

Browse Source 
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>
This commit is contained in:
Scott R Parish 2007-10-27 01:36:52 -07:00 committed by Junio C Hamano
parent 384df83312
commit 0966003c8e
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
help.c
View File

@ -96,36 +96,24 @@ static void pretty_print_string_list(struct cmdname **cmdname, int longest)
static void list_commands(const char *exec_path) static void list_commands(const char *exec_path)
{ {
unsigned int longest = 0; unsigned int longest = 0;
char path[PATH_MAX];
const char *prefix = "git-"; const char *prefix = "git-";
int prefix_len = strlen(prefix); int prefix_len = strlen(prefix);
int dirlen;
DIR *dir = opendir(exec_path); DIR *dir = opendir(exec_path);
struct dirent *de; struct dirent *de;
if (!dir) { if (!dir || chdir(exec_path)) {
fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno)); fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno));
exit(1); 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) { while ((de = readdir(dir)) != NULL) {
struct stat st; struct stat st;
int entlen; int entlen;
if (prefixcmp(de->d_name, prefix)) if (prefixcmp(de->d_name, prefix))
continue; 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) || !S_ISREG(st.st_mode) ||
!(st.st_mode & S_IXUSR)) !(st.st_mode & S_IXUSR))
continue; continue;