parse-options: make some arguments optional, add callbacks.

diff --git a/run-command.c b/run-command.c
index 043b5701a1bb888b5b4fce9299b9dc28c176d09e..7e779d33ee9ea5f7d2e6aedc8c3a0a0476e87135 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -76,6 +76,14 @@ int start_command(struct child_process *cmd)
                if (cmd->dir && chdir(cmd->dir))
                        die("exec %s: cd to %s failed (%s)", cmd->argv[0],
                            cmd->dir, strerror(errno));
+               if (cmd->env) {
+                       for (; *cmd->env; cmd->env++) {
+                               if (strchr(*cmd->env, '='))
+                                       putenv((char*)*cmd->env);
+                               else
+                                       unsetenv(*cmd->env);
+                       }
+               }
                if (cmd->git_cmd) {
                        execv_git_cmd(cmd->argv);
                } else {
@@ -137,7 +145,8 @@ int run_command(struct child_process *cmd)
 }
 
 static void prepare_run_command_v_opt(struct child_process *cmd,
-                                     const char **argv, int opt)
+                                     const char **argv,
+                                     int opt)
 {
        memset(cmd, 0, sizeof(*cmd));
        cmd->argv = argv;
@@ -160,3 +169,12 @@ int run_command_v_opt_cd(const char **argv, int opt, const char *dir)
        cmd.dir = dir;
        return run_command(&cmd);
 }
+
+int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env)
+{
+       struct child_process cmd;
+       prepare_run_command_v_opt(&cmd, argv, opt);
+       cmd.dir = dir;
+       cmd.env = env;
+       return run_command(&cmd);
+}