diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2007-05-23 22:21:39 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-23 22:38:44 -0700 |
| commit | 3427b375b594b93ed47ae80ca1d6bb361d7d8f5e (patch) | |
| tree | b64edcb1ed76207acc12ebc534a3cb7102ff6652 | |
| parent | Add ability to specify environment extension to run_command (diff) | |
| download | tgif-3427b375b594b93ed47ae80ca1d6bb361d7d8f5e.tar.xz | |
Allow environment variables to be unset in the processes started by run_command
To unset a variable, just specify its name, without "=". For example:
const char *env[] = {"GIT_DIR=.git", "PWD", NULL};
const char *argv[] = {"git-ls-files", "-s", NULL};
int err = run_command_v_opt_cd_env(argv, RUN_GIT_CMD, ".", env);
The PWD will be unset before executing git-ls-files.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | run-command.c | 8 | ||||
| -rw-r--r-- | run-command.h | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/run-command.c b/run-command.c index 4ee4bdf16c..7e779d33ee 100644 --- a/run-command.c +++ b/run-command.c @@ -77,8 +77,12 @@ int start_command(struct child_process *cmd) 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); + 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); diff --git a/run-command.h b/run-command.h index af1e0bf178..7958eb1e0b 100644 --- a/run-command.h +++ b/run-command.h @@ -35,6 +35,11 @@ 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); + +/* + * env (the environment) is to be formatted like environ: "VAR=VALUE". + * To unset an environment variable use just "VAR". + */ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env); #endif |