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

Win32: patch Windows environment on startup

Browse Source 
Fix Windows specific environment settings on startup rather than checking
for special values on every getenv call.

As a side effect, this makes the patched environment (i.e. with properly
initialized TMPDIR and TERM) available to child processes.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karsten Blees 2014-07-17 17:38:05 +02:00 committed by Junio C Hamano
parent 343ff06da7
commit 6dc715439b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compat/mingw.c
View File

@ -1251,7 +1251,7 @@ static int do_putenv(char **env, const char *name, int size, int free_old)
return size; return size;
} }
static char *do_getenv(const char *name) char *mingw_getenv(const char *name)
{ {
char *value; char *value;
int pos = bsearchenv(environ, name, environ_size - 1); int pos = bsearchenv(environ, name, environ_size - 1);
@ -1261,18 +1261,6 @@ static char *do_getenv(const char *name)
return value ? &value[1] : NULL; return value ? &value[1] : NULL;
} }
char *mingw_getenv(const char *name)
{
char *result = do_getenv(name);
if (!result && !strcmp(name, "TMPDIR")) {
/* on Windows it is TMP and TEMP */
result = do_getenv("TMP");
if (!result)
result = do_getenv("TEMP");
}
return result;
}
int mingw_putenv(const char *namevalue) int mingw_putenv(const char *namevalue)
{ {
ALLOC_GROW(environ, (environ_size + 1) * sizeof(char*), environ_alloc); ALLOC_GROW(environ, (environ_size + 1) * sizeof(char*), environ_alloc);
@ -2114,6 +2102,17 @@ void mingw_startup()
/* sort environment for O(log n) getenv / putenv */ /* sort environment for O(log n) getenv / putenv */
qsort(environ, i, sizeof(char*), compareenv); qsort(environ, i, sizeof(char*), compareenv);
/* fix Windows specific environment settings */
/* on Windows it is TMP and TEMP */
if (!mingw_getenv("TMPDIR")) {
const char *tmp = mingw_getenv("TMP");
if (!tmp)
tmp = mingw_getenv("TEMP");
if (tmp)
setenv("TMPDIR", tmp, 1);
}
/* initialize critical section for waitpid pinfo_t list */ /* initialize critical section for waitpid pinfo_t list */
InitializeCriticalSection(&pinfo_cs); InitializeCriticalSection(&pinfo_cs);