[PATCH] Add ability to specify environment extension to run_command
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- May 21, 2007, 22:48 UTC
- Message-ID
- <20070521224828.GA10890@steel.home>
- In-Reply-To
- <20070521090339.GH942MdfPADPa@greensroom.kotnet.org>
There is no way to specify and override for the environment: there is no visible user for it (yet, something in git-daemon could need it).
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> ---
Sven Verdoolaege, Mon, May 21, 2007 11:03:39 +0200:
> Could you sign-off on this for me so I can use it my patch set? >
So here it is. On top of the previos patch regarding chdir before exec. Junio, if needed, I can resend that first patch about chdir.
run-command.c | 17 ++++++++++++++++- run-command.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/run-command.c b/run-command.c index 043b570..605aa1e 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,13 @@ 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); +} + diff --git a/run-command.h b/run-command.h index cbd7484..af1e0bf 100644 --- a/run-command.h +++ b/run-command.h @@ -17,6 +17,7 @@ struct child_process { int in; int out; const char *dir; + const char *const *env; unsigned close_in:1; unsigned close_out:1; unsigned no_stdin:1; @@ -34,5 +35,6 @@ int run_command(struct child_process *); #define RUN_COMMAND_STDOUT_TO_STDERR 4 int run_command_v_opt(const char **argv, int opt); int run_command_v_opt_cd(const char **argv, int opt, const char *dir); +int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env); #endif
-- 1.5.2.rc3.112.gc1e43