compat/mingw.[ch]: Change return type of exec functions to int

The POSIX standard specifies a return type of int for all six exec
functions. In addition, all exec functions return -1 on error, and
simply do not return on success. However, the current emulation of
the exec functions on mingw are declared with a void return type.

This would cause a problem should any code attempt to call the
exec function in a non-void context. In particular, if an exec
function were used in a conditional it would fail to compile.

In order to improve the fidelity of the emulation, we change the
return type of the mingw_execv[p] functions to int and return -1
on error.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/mingw.c b/compat/mingw.c
index a0ac487c0c12ea0e7c81485b5784e28f2115a2ea..afc892d6b1837d807490f42790bf29686d074a10 100644 (file)
--- 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);
 {
        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);
                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);
 {
        mingw_execve(cmd, argv, environ);

+       return -1;

 }
 
 int mingw_kill(pid_t pid, int sig)
 }
 
 int mingw_kill(pid_t pid, int sig)

diff --git a/compat/mingw.h b/compat/mingw.h
index 0ff1e04812ef2491f15b1d40bb8e1c2977b26d98..ef5b15014e98b2e4d20a8087dd497216db95d2fc 100644 (file)
--- 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);
 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
 #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)
 #define execv mingw_execv
 
 static inline unsigned int git_ntohl(unsigned int x)