undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow environment variables to be unset in the processes started by run_command

Browse Source 
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>
This commit is contained in:
Alex Riesen 2007-05-23 22:21:39 +02:00 committed by Junio C Hamano
parent ee4931486b
commit 3427b375b5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
run-command.c
View File

@ -77,8 +77,12 @@ int start_command(struct child_process *cmd)
die("exec %s: cd to %s failed (%s)", cmd->argv[0], die("exec %s: cd to %s failed (%s)", cmd->argv[0],
cmd->dir, strerror(errno)); cmd->dir, strerror(errno));
if (cmd->env) { if (cmd->env) {
for (; *cmd->env; cmd->env++) for (; *cmd->env; cmd->env++) {
putenv((char*)*cmd->env); if (strchr(*cmd->env, '='))
putenv((char*)*cmd->env);
else
unsetenv(*cmd->env);
}
} }
if (cmd->git_cmd) { if (cmd->git_cmd) {
execv_git_cmd(cmd->argv); execv_git_cmd(cmd->argv);

5
run-command.h
View File

@ -35,6 +35,11 @@ int run_command(struct child_process *);
#define RUN_COMMAND_STDOUT_TO_STDERR 4 #define RUN_COMMAND_STDOUT_TO_STDERR 4
int run_command_v_opt(const char **argv, int opt); 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(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); int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
#endif #endif