global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Make 'git help -a' work.

Browse Source 
git help -a scans the PATH for git commands. On Windows it failed for two
reasons:

- The PATH separator is ';', not ':' on Windows.

- stat() does not set the executabe bit.

We now open the file and guess whether it is executable.

The result of the guess is good enough for the list of git commands, but
it is of no use for a general stat() implementation because (1) it is a
guess, (2) the user has no way to influence the outcome (via chmod or
similar), and (3) it would reduce stat() performance by an unacceptable
amount. Therefore, this strategy is a special-case local to help.c.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
This commit is contained in:
Johannes Sixt
2008-01-14 14:05:33 +01:00
parent 9b4b9da619
commit dfd188abab
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
help.c
View File

@@ -165,6 +165,32 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest)
}
}
static int is_executable(const char *name)
{
struct stat st;
if (stat(name, &st) || /* stat, not lstat */
!S_ISREG(st.st_mode))
return 0;
#ifdef __MINGW32__
/* cannot trust the executable bit, peek into the file instead */
char buf[3] = { 0 };
int n;
int fd = open(name, O_RDONLY);
st.st_mode &= ~S_IXUSR;
if (fd >= 0) {
n = read(fd, buf, 2);
if (n == 2)
/* DOS executables start with "MZ" */
if (!strcmp(buf, "#!") || !strcmp(buf, "MZ"))
st.st_mode |= S_IXUSR;
close(fd);
}
#endif
return st.st_mode & S_IXUSR;
}
static unsigned int list_commands_in_dir(struct cmdnames *cmds,
const char *path)
{
@@ -178,15 +204,12 @@ static unsigned int list_commands_in_dir(struct cmdnames *cmds,
return 0;
while ((de = readdir(dir)) != NULL) {
struct stat st;
int entlen;
if (prefixcmp(de->d_name, prefix))
continue;
if (stat(de->d_name, &st) || /* stat, not lstat */
!S_ISREG(st.st_mode) ||
!(st.st_mode & S_IXUSR))
if (!is_executable(de->d_name))
continue;
entlen = strlen(de->d_name) - prefix_len;
@@ -210,6 +233,11 @@ static void list_commands(void)
const char *env_path = getenv("PATH");
char *paths, *path, *colon;
const char *exec_path = git_exec_path();
#ifdef __MINGW32__
char sep = ';';
#else
char sep = ':';
#endif
if (exec_path)
longest = list_commands_in_dir(&main_cmds, exec_path);
@@ -221,7 +249,7 @@ static void list_commands(void)
path = paths = xstrdup(env_path);
while (1) {
if ((colon = strchr(path, ':')))
if ((colon = strchr(path, sep)))
*colon = 0;
len = list_commands_in_dir(&other_cmds, path);