Make sure packedgitwindowsize is multiple of (pagesize * 2)

diff --git a/run-command.c b/run-command.c
index 5787a5095548c6530a4d987705a3189ed57356c4..cfbad74d145145944352c568064cc2f8c0d4c5cb 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1,28 +1,39 @@
 #include "cache.h"
 #include "run-command.h"
-#include <sys/wait.h>
+#include "exec_cmd.h"
 
-int run_command_v(int argc, char **argv)
+int run_command_v_opt(const char **argv, int flags)
 {
        pid_t pid = fork();
 
        if (pid < 0)
                return -ERR_RUN_COMMAND_FORK;
        if (!pid) {
-               execvp(argv[0], (char *const*) argv);
+               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;
-               int retval = waitpid(pid, &status, 0);
+               pid_t waiting = waitpid(pid, &status, 0);
 
-               if (retval < 0) {
+               if (waiting < 0) {
                        if (errno == EINTR)
                                continue;
-                       error("waitpid failed (%s)", strerror(retval));
+                       error("waitpid failed (%s)", strerror(errno));
                        return -ERR_RUN_COMMAND_WAITPID;
                }
-               if (retval != pid)
+               if (waiting != pid)
                        return -ERR_RUN_COMMAND_WAITPID_WRONG_PID;
                if (WIFSIGNALED(status))
                        return -ERR_RUN_COMMAND_WAITPID_SIGNAL;
@@ -36,14 +47,17 @@ int run_command_v(int argc, char **argv)
        }
 }
 
-int run_command(const char *cmd, ...)
+int run_command_v(const char **argv)
+{
+       return run_command_v_opt(argv, 0);
+}
+
+static int run_command_va_opt(int opt, const char *cmd, va_list param)
 {
        int argc;
-       char *argv[MAX_RUN_COMMAND_ARGS];
+       const char *argv[MAX_RUN_COMMAND_ARGS];
        const char *arg;
-       va_list param;
 
-       va_start(param, cmd);
        argv[0] = (char*) cmd;
        argc = 1;
        while (argc < MAX_RUN_COMMAND_ARGS) {
@@ -51,8 +65,29 @@ int run_command(const char *cmd, ...)
                if (!arg)
                        break;
        }
-       va_end(param);
        if (MAX_RUN_COMMAND_ARGS <= argc)
                return error("too many args to run %s", cmd);
-       return run_command_v(argc, argv);
+       return run_command_v_opt(argv, opt);
+}
+
+int run_command_opt(int opt, const char *cmd, ...)
+{
+       va_list params;
+       int r;
+
+       va_start(params, cmd);
+       r = run_command_va_opt(opt, cmd, params);
+       va_end(params);
+       return r;
+}
+
+int run_command(const char *cmd, ...)
+{
+       va_list params;
+       int r;
+
+       va_start(params, cmd);
+       r = run_command_va_opt(0, cmd, params);
+       va_end(params);
+       return r;
 }