undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32: simplify internal mingw_spawn* APIs

Browse Source 
The only public spawn function that needs to tweak the environment is
mingw_spawnvpe (called from start_command). Nevertheless, all internal
spawn* functions take an env parameter and needlessly pass the global
char **environ around. Remove the env parameter where it's not needed.

This removes the internal mingw_execve abstraction, which is no longer
needed.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karsten Blees 2011-11-25 21:33:17 +01:00 committed by Junio C Hamano
parent 570f1e6e1a
commit 3e66e47b1b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compat/mingw.c
View File

@ -941,10 +941,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
return (pid_t)pi.dwProcessId; return (pid_t)pi.dwProcessId;
} }
static pid_t mingw_spawnve(const char *cmd, const char **argv, char **env, static pid_t mingw_spawnv(const char *cmd, const char **argv, int prepend_cmd)
int prepend_cmd)
{ {
return mingw_spawnve_fd(cmd, argv, env, NULL, prepend_cmd, 0, 1, 2); return mingw_spawnve_fd(cmd, argv, environ, NULL, prepend_cmd, 0, 1, 2);
} }
pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env, pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
@ -986,7 +985,7 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
return pid; return pid;
} }
static int try_shell_exec(const char *cmd, char *const *argv, char **env) static int try_shell_exec(const char *cmd, char *const *argv)
{ {
const char *interpr = parse_interpreter(cmd); const char *interpr = parse_interpreter(cmd);
char **path; char **path;
@ -1004,7 +1003,7 @@ static int try_shell_exec(const char *cmd, char *const *argv, char **env)
argv2 = xmalloc(sizeof(*argv) * (argc+1)); argv2 = xmalloc(sizeof(*argv) * (argc+1));
argv2[0] = (char *)cmd; /* full path to the script file */ argv2[0] = (char *)cmd; /* full path to the script file */
memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc); memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
pid = mingw_spawnve(prog, argv2, env, 1); pid = mingw_spawnv(prog, argv2, 1);
if (pid >= 0) { if (pid >= 0) {
int status; int status;
if (waitpid(pid, &status, 0) < 0) if (waitpid(pid, &status, 0) < 0)
@ -1019,13 +1018,13 @@ static int try_shell_exec(const char *cmd, char *const *argv, char **env)
return pid; return pid;
} }
static int mingw_execve(const char *cmd, char *const *argv, char *const *env) int mingw_execv(const char *cmd, char *const *argv)
{ {
/* check if git_command is a shell script */ /* check if git_command is a shell script */
if (!try_shell_exec(cmd, argv, (char **)env)) { if (!try_shell_exec(cmd, argv)) {
int pid, status; int pid, status;
pid = mingw_spawnve(cmd, (const char **)argv, (char **)env, 0); pid = mingw_spawnv(cmd, (const char **)argv, 0);
if (pid < 0) if (pid < 0)
return -1; return -1;
if (waitpid(pid, &status, 0) < 0) if (waitpid(pid, &status, 0) < 0)
@ -1041,7 +1040,7 @@ int mingw_execvp(const char *cmd, char *const *argv)
char *prog = path_lookup(cmd, path, 0); char *prog = path_lookup(cmd, path, 0);
if (prog) { if (prog) {
mingw_execve(prog, argv, environ); mingw_execv(prog, argv);
free(prog); free(prog);
} else } else
errno = ENOENT; errno = ENOENT;
@ -1050,12 +1049,6 @@ int mingw_execvp(const char *cmd, char *const *argv)
return -1; return -1;
} }
int mingw_execv(const char *cmd, char *const *argv)
{
mingw_execve(cmd, argv, environ);
return -1;
}
int mingw_kill(pid_t pid, int sig) int mingw_kill(pid_t pid, int sig)
{ {
if (pid > 0 && sig == SIGTERM) { if (pid > 0 && sig == SIGTERM) {