Win32: let mingw_execve() return an int
This is in the great tradition of POSIX. Original fix by Olivier Refalo. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Stepan Kasal <kasal@ucw.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 28, 2012 at 21:21 UTC
570f1e6e1a7145efb4e80da9c711fcbc319f6b17
1 file changed
+3
-2
compat/mingw.c
+3
-2
@@ -1019,7 +1019,7 @@ static int try_shell_exec(const char *cmd, char *const *argv, char **env)
1019
return pid;
1020
}
1021
1022
-static void mingw_execve(const char *cmd, char *const *argv, char *const *env)
1022
+static int mingw_execve(const char *cmd, char *const *argv, char *const *env)
1023
{
1024
/* check if git_command is a shell script */
1025
if (!try_shell_exec(cmd, argv, (char **)env)) {
@@ -1027,11 +1027,12 @@ static void mingw_execve(const char *cmd, char *const *argv, char *const *env)
1027
1028
pid = mingw_spawnve(cmd, (const char **)argv, (char **)env, 0);
1029
if (pid < 0)
1030
- return;
1030
+ return -1;
1031
if (waitpid(pid, &status, 0) < 0)
1032
status = 255;
1033
exit(status);
1034
}
1035
+ return -1;
1036
}
1037
1038
int mingw_execvp(const char *cmd, char *const *argv)