projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/git-svn: handle array values correctly
[git.git]
/
run-command.c
diff --git
a/run-command.c
b/run-command.c
index
8bf5922
..
ca67ee9
100644
(file)
--- a/
run-command.c
+++ b/
run-command.c
@@
-1,8
+1,9
@@
#include "cache.h"
#include "run-command.h"
#include <sys/wait.h>
#include "cache.h"
#include "run-command.h"
#include <sys/wait.h>
+#include "exec_cmd.h"
-int run_command_v_opt(int argc, char **argv, int flags)
+int run_command_v_opt(int argc, c
onst c
har **argv, int flags)
{
pid_t pid = fork();
{
pid_t pid = fork();
@@
-13,9
+14,13
@@
int run_command_v_opt(int argc, char **argv, int flags)
int fd = open("/dev/null", O_RDWR);
dup2(fd, 0);
dup2(fd, 1);
int fd = open("/dev/null", O_RDWR);
dup2(fd, 0);
dup2(fd, 1);
- close(fd);
+ close(fd);
+ }
+ if (flags & RUN_GIT_CMD) {
+ execv_git_cmd(argv);
+ } else {
+ execvp(argv[0], (char *const*) argv);
}
}
- execvp(argv[0], (char *const*) argv);
die("exec %s failed.", argv[0]);
}
for (;;) {
die("exec %s failed.", argv[0]);
}
for (;;) {
@@
-42,7
+47,7
@@
int run_command_v_opt(int argc, char **argv, int flags)
}
}
}
}
-int run_command_v(int argc, char **argv)
+int run_command_v(int argc, c
onst c
har **argv)
{
return run_command_v_opt(argc, argv, 0);
}
{
return run_command_v_opt(argc, argv, 0);
}
@@
-50,7
+55,7
@@
int run_command_v(int argc, char **argv)
int run_command(const char *cmd, ...)
{
int argc;
int run_command(const char *cmd, ...)
{
int argc;
- char *argv[MAX_RUN_COMMAND_ARGS];
+ c
onst c
har *argv[MAX_RUN_COMMAND_ARGS];
const char *arg;
va_list param;
const char *arg;
va_list param;