diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2009-09-11 21:40:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-12 03:33:54 +0400 |
| commit | 2affea4125a0ae6c528a14f14731748c1fad9a8a (patch) | |
| tree | 81ba1ff206e66c92aa340ba4615a3d901039b150 /compat/mingw.h | |
| parent | 434a6db7dcf8688fe08098e218113c18b7c9aeaf (diff) | |
start_command: do not clobber cmd->env on Windows code path
Previously, it would not be possible to call start_command twice for the
same struct child_process that has env set.
The fix is achieved by moving the loop that modifies the environment block
into a helper function. This also allows us to make two other helper
functions static.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
| -rw-r--r-- | compat/mingw.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 948de66eb5..c43917cd6e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -222,9 +222,8 @@ void mingw_open_html(const char *path); * helpers */ -char **copy_environ(void); +char **make_augmented_environ(const char *const *vars); void free_environ(char **env); -char **env_setenv(char **env, const char *name); /* * A replacement of main() that ensures that argv[0] has a path |