From 2affea4125a0ae6c528a14f14731748c1fad9a8a Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Fri, 11 Sep 2009 19:40:08 +0200 Subject: start_command: do not clobber cmd->env on Windows code path Previously, it would not be possible to call start_command twice for the same struct child_process that has env set. The fix is achieved by moving the loop that modifies the environment block into a helper function. This also allows us to make two other helper functions static. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- run-command.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'run-command.c') diff --git a/run-command.c b/run-command.c index f3e7abb7de..ac314a5a8d 100644 --- a/run-command.c +++ b/run-command.c @@ -173,11 +173,8 @@ fail_pipe: if (cmd->dir) die("chdir in start_command() not implemented"); - if (cmd->env) { - env = copy_environ(); - for (; *cmd->env; cmd->env++) - env = env_setenv(env, *cmd->env); - } + if (cmd->env) + env = make_augmented_environ(cmd->env); if (cmd->git_cmd) { cmd->argv = prepare_git_cmd(cmd->argv); -- cgit v1.2.3