From 1568fea01eb25a293f8dae570a31ca34d41b5442 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Tue, 22 May 2007 23:48:23 +0200 Subject: [PATCH 1/3] Add run_command_v_opt_cd: chdir into a directory before exec It can make code simplier (no need to preserve cwd) and safer (no chance the cwd of the current process is accidentally forgotten). Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- run-command.c | 27 ++++++++++++++++++++++----- run-command.h | 2 ++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/run-command.c b/run-command.c index eff523e191..043b5701a1 100644 --- a/run-command.c +++ b/run-command.c @@ -73,6 +73,9 @@ int start_command(struct child_process *cmd) close(cmd->out); } + if (cmd->dir && chdir(cmd->dir)) + die("exec %s: cd to %s failed (%s)", cmd->argv[0], + cmd->dir, strerror(errno)); if (cmd->git_cmd) { execv_git_cmd(cmd->argv); } else { @@ -133,13 +136,27 @@ int run_command(struct child_process *cmd) return finish_command(cmd); } +static void prepare_run_command_v_opt(struct child_process *cmd, + const char **argv, int opt) +{ + memset(cmd, 0, sizeof(*cmd)); + cmd->argv = argv; + cmd->no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0; + cmd->git_cmd = opt & RUN_GIT_CMD ? 1 : 0; + cmd->stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0; +} + int run_command_v_opt(const char **argv, int opt) { struct child_process cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.argv = argv; - cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0; - cmd.git_cmd = opt & RUN_GIT_CMD ? 1 : 0; - cmd.stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0; + prepare_run_command_v_opt(&cmd, argv, opt); + return run_command(&cmd); +} + +int run_command_v_opt_cd(const char **argv, int opt, const char *dir) +{ + struct child_process cmd; + prepare_run_command_v_opt(&cmd, argv, opt); + cmd.dir = dir; return run_command(&cmd); } diff --git a/run-command.h b/run-command.h index 3680ef9d45..cbd7484a00 100644 --- a/run-command.h +++ b/run-command.h @@ -16,6 +16,7 @@ struct child_process { pid_t pid; int in; int out; + const char *dir; unsigned close_in:1; unsigned close_out:1; unsigned no_stdin:1; @@ -32,5 +33,6 @@ int run_command(struct child_process *); #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ #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); #endif From ee4931486b752b0a3ee04be31f25aed13913cb31 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Tue, 22 May 2007 23:48:47 +0200 Subject: [PATCH 2/3] 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 Signed-off-by: Junio C Hamano --- run-command.c | 16 +++++++++++++++- run-command.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/run-command.c b/run-command.c index 043b5701a1..4ee4bdf16c 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); +} diff --git a/run-command.h b/run-command.h index cbd7484a00..af1e0bf178 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 From 3427b375b594b93ed47ae80ca1d6bb361d7d8f5e Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed, 23 May 2007 22:21:39 +0200 Subject: [PATCH 3/3] 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 Signed-off-by: Junio C Hamano --- run-command.c | 8 ++++++-- 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