Teach lookup_prog not to select directories

Eric Raible · gitster · commit fe77b6959c47 · 2008-07-19T11:17:43.000-07:00
Without this simple fix "git gui" in the git source directory
finds the git-gui directory instead of the tcl script in /usr/bin.

Signed-off-by: Eric Raible &lt;raible@gmail.com&gt;
Signed-off-by: Johannes Sixt &lt;johannes.sixt@telecom.at&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -536,7 +536,8 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on
 		return xstrdup(path);
 	path[strlen(path)-4] = '\0';
 	if ((!exe_only || isexe) && access(path, F_OK) == 0)
-		return xstrdup(path);
+		if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
+			return xstrdup(path);
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,8 @@ static char lookup_prog(const char dir, const char *cmd, int isexe, int exe_on`
`536`	`536`	`return xstrdup(path);`
`537`	`537`	`path[strlen(path)-4] = '\0';`
`538`	`538`	`if ((!exe_only \|\| isexe) && access(path, F_OK) == 0)`
`539`		`- return xstrdup(path);`
	`539`	`+ if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))`
	`540`	`+ return xstrdup(path);`
`540`	`541`	`return NULL;`
`541`	`542`	`}`
`542`	`543`