summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-20 22:50:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-20 22:50:03 (GMT)
commitbd6f71d1fca865507b3f0a9e310b4d02632cf0ce (patch)
tree9ec8bf5af578538c1f690e8169fc123cb7434dea /compat
parent27da1cf65b9f30a51c061409c697f94b9b56b09c (diff)
parent38f865c27d1f2560afb48efd2b7b105c1278c4b5 (diff)
downloadgit-bd6f71d1fca865507b3f0a9e310b4d02632cf0ce.zip
git-bd6f71d1fca865507b3f0a9e310b4d02632cf0ce.tar.gz
git-bd6f71d1fca865507b3f0a9e310b4d02632cf0ce.tar.bz2
Merge branch 'jk/run-command-eacces'
When PATH contains an unreadable directory, alias expansion code did not kick in, and failed with an error that said "git-subcmd" was not found. By Jeff King (1) and Ramsay Jones (1) * jk/run-command-eacces: run-command: treat inaccessible directories as ENOENT compat/mingw.[ch]: Change return type of exec functions to int
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c6
-rw-r--r--compat/mingw.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index a0ac487..afc892d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1003,7 +1003,7 @@ static void mingw_execve(const char *cmd, char *const *argv, char *const *env)
}
}
-void mingw_execvp(const char *cmd, char *const *argv)
+int mingw_execvp(const char *cmd, char *const *argv)
{
char **path = get_path_split();
char *prog = path_lookup(cmd, path, 0);
@@ -1015,11 +1015,13 @@ void mingw_execvp(const char *cmd, char *const *argv)
errno = ENOENT;
free_path_split(path);
+ return -1;
}
-void mingw_execv(const char *cmd, char *const *argv)
+int mingw_execv(const char *cmd, char *const *argv)
{
mingw_execve(cmd, argv, environ);
+ return -1;
}
int mingw_kill(pid_t pid, int sig)
diff --git a/compat/mingw.h b/compat/mingw.h
index 0ff1e04..ef5b150 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -274,9 +274,9 @@ int mingw_utime(const char *file_name, const struct utimbuf *times);
pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
const char *dir,
int fhin, int fhout, int fherr);
-void mingw_execvp(const char *cmd, char *const *argv);
+int mingw_execvp(const char *cmd, char *const *argv);
#define execvp mingw_execvp
-void mingw_execv(const char *cmd, char *const *argv);
+int mingw_execv(const char *cmd, char *const *argv);
#define execv mingw_execv
static inline unsigned int git_ntohl(unsigned int x)