Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
> From: Heiko Voigt <hvoigt@xxxxxxxxxx>
>
> The previous implementation said that the filesystem information on
> Windows is not reliable to determine whether a file is executable. To
> gather this information it was peeking into the first two bytes of a
> file to see whether it looks executable.
>
> Apart from the fact that on Windows executables are defined as such by
> their extension (and Git has special code to support "executing" scripts
> when they have a she-bang line) it leads to serious performance
> problems: not only do we have to open many files now, it gets even
> slower when a virus scanner is running.
Heiko, around here (before going into the details of how severe the
problem is and how wonderful the result applying of this change is)
is the best place to summarize the solution. E.g.
Because the definition of "executable" on Windows is based
on the file extension, update the function to declare that a
file with ".exe" extension without opening and reading the
early bytes from it. This avoids serious performance issues.
I paraphrased the rest only so that the description of the solution
(i.e. "instead of opening and peeking, we trust .exe suffix") fits
well in the surrounding text; the important part is to say what the
change does clearly.
I agree with the reasoning and the execution of the patch, except
that
- "correct behaviour" in the title makes it appear that this is a
correctness thing, but this is primarily a performance fix.
- It is a bit strange that "MZ" is dropped in the same patch
without any mention.
The latter may be "correctness" fix, in that earlier we treated any
file that happens to begin with MZ as an executable, regardless of
the filename, which may have misidentified a non-executable file as
an executable. If that is what is going on, it deserves to be
described in the log message.
> diff --git a/help.c b/help.c
> index 53e2a67e00..bc6cd19cf3 100644
> --- a/help.c
> +++ b/help.c
> @@ -105,7 +105,22 @@ static int is_executable(const char *name)
> return 0;
>
> #if defined(GIT_WINDOWS_NATIVE)
> -{ /* cannot trust the executable bit, peek into the file instead */
> + /*
> + * On Windows there is no executable bit. The file extension
> + * indicates whether it can be run as an executable, and Git
> + * has special-handling to detect scripts and launch them
> + * through the indicated script interpreter. We test for the
> + * file extension first because virus scanners may make
> + * it quite expensive to open many files.
> + */
> + if (ends_with(name, ".exe"))
> + return S_IXUSR;
> +
> +{
> + /*
> + * Now that we know it does not have an executable extension,
> + * peek into the file instead.
> + */
> char buf[3] = { 0 };
> int n;
> int fd = open(name, O_RDONLY);
> @@ -113,8 +128,8 @@ static int is_executable(const char *name)
> if (fd >= 0) {
> n = read(fd, buf, 2);
> if (n == 2)
> - /* DOS executables start with "MZ" */
> - if (!strcmp(buf, "#!") || !strcmp(buf, "MZ"))
> + /* look for a she-bang */
> + if (!strcmp(buf, "#!"))
> st.st_mode |= S_IXUSR;
> close(fd);
> }
>
> base-commit: 4e59582ff70d299f5a88449891e78d15b4b3fabe