Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11

gitster · gitster · commit 91feb387f2cb · 2012-09-11T11:09:19.000-07:00
* jc/maint-sane-execvp-notdir:
  sane_execvp(): ignore non-directory on $PATH
diff --git a/run-command.c b/run-command.c
@@ -139,6 +139,8 @@ int sane_execvp(const char *file, char * const argv[])
 	 */
 	if (errno == EACCES && !strchr(file, '/'))
 		errno = exists_in_PATH(file) ? EACCES : ENOENT;
+	else if (errno == ENOTDIR && !strchr(file, '/'))
+		errno = ENOENT;
 	return -1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ int sane_execvp(const char file, char const argv[])`
`139`	`139`	`*/`
`140`	`140`	`if (errno == EACCES && !strchr(file, '/'))`
`141`	`141`	`errno = exists_in_PATH(file) ? EACCES : ENOENT;`
	`142`	`+ else if (errno == ENOTDIR && !strchr(file, '/'))`
	`143`	`+ errno = ENOENT;`
`142`	`144`	`return -1;`
`143`	`145`	`}`
`144`	`146`