summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-05-22 21:48:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-24 05:38:44 (GMT)
commitee4931486b752b0a3ee04be31f25aed13913cb31 (patch)
treef387c83885ae57a6c216bd5b2d064a7d048f8e59 /run-command.c
parent1568fea01eb25a293f8dae570a31ca34d41b5442 (diff)
downloadgit-ee4931486b752b0a3ee04be31f25aed13913cb31.zip
git-ee4931486b752b0a3ee04be31f25aed13913cb31.tar.gz
git-ee4931486b752b0a3ee04be31f25aed13913cb31.tar.bz2
Add ability to specify environment extension to run_command
There is no way to specify and override for the environment: there'd be no user for it yet. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c
index 043b570..4ee4bdf 100644
--- a/run-command.c
+++ b/run-command.c
@@ -76,6 +76,10 @@ 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++)
+ putenv((char*)*cmd->env);
+ }
if (cmd->git_cmd) {
execv_git_cmd(cmd->argv);
} else {
@@ -137,7 +141,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 +165,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);
+}