global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use spawn*_pipe() instead of fork()/exec() in run_command_*().

Browse Source
This commit is contained in:
Johannes Sixt
2007-01-25 11:12:37 +01:00
parent daabe66f18
commit 479be60605
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
run-command.c
View File

@@ -1,28 +1,31 @@
#include "cache.h"
#include "run-command.h"
#include "exec_cmd.h"
#include "spawn-pipe.h"
int run_command_v_opt(const char **argv, int flags)
{
pid_t pid = fork();
pid_t pid;
int fd_i[2] = { -1, -1 };
int fd_o[2] = { -1, -1 };
if (flags & RUN_COMMAND_NO_STDIN) {
#ifndef __MINGW32__
fd_i[0] = open("/dev/null", O_RDWR);
#else
fd_i[0] = open("nul", O_RDWR);
#endif
}
if (flags & RUN_COMMAND_STDOUT_TO_STDERR)
fd_o[1] = dup(2);
if (flags & RUN_GIT_CMD) {
pid = spawnv_git_cmd(argv, fd_i, fd_o);
} else {
pid = spawnvpe_pipe(argv[0], argv, environ, fd_i, fd_o);
}
if (pid < 0)
return -ERR_RUN_COMMAND_FORK;
if (!pid) {
if (flags & RUN_COMMAND_NO_STDIN) {
int fd = open("/dev/null", O_RDWR);
dup2(fd, 0);
close(fd);
}
if (flags & RUN_COMMAND_STDOUT_TO_STDERR)
dup2(2, 1);
if (flags & RUN_GIT_CMD) {
execv_git_cmd(argv);
} else {
execvp(argv[0], (char *const*) argv);
}
die("exec %s failed.", argv[0]);
}
for (;;) {
int status, code;
pid_t waiting = waitpid(pid, &status, 0);