diff options
| author | René Scharfe <l.s.r@web.de> | 2014-10-19 13:14:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-19 15:26:34 -0700 |
| commit | a915459097b72da9cc058172a54029352b684b0f (patch) | |
| tree | 4e8ba96b870ec7df1227e6819b176f64ca8b0ef7 /transport-helper.c | |
| parent | 19a583dc39e3e1110f746e837c5ce1953d6ebfa1 (diff) | |
| download | git-a915459097b72da9cc058172a54029352b684b0f.tar.gz | |
use env_array member of struct child_processrs/run-command-env-array
Convert users of struct child_process to using the managed env_array for
specifying environment variables instead of supplying an array on the
stack or bringing their own argv_array. This shortens and simplifies
the code and ensures automatically that the allocated memory is freed
after use.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/transport-helper.c b/transport-helper.c index 2b24d51a24..033a228613 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -108,12 +108,6 @@ static struct child_process *get_helper(struct transport *transport) int refspec_alloc = 0; int duped; int code; - char git_dir_buf[sizeof(GIT_DIR_ENVIRONMENT) + PATH_MAX + 1]; - const char *helper_env[] = { - git_dir_buf, - NULL - }; - if (data->helper) return data->helper; @@ -129,8 +123,8 @@ static struct child_process *get_helper(struct transport *transport) helper->git_cmd = 0; helper->silent_exec_failure = 1; - snprintf(git_dir_buf, sizeof(git_dir_buf), "%s=%s", GIT_DIR_ENVIRONMENT, get_git_dir()); - helper->env = helper_env; + argv_array_pushf(&helper->env_array, "%s=%s", GIT_DIR_ENVIRONMENT, + get_git_dir()); code = start_command(helper); if (code < 0 && errno == ENOENT) |