mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mingw: factor out Windows specific environment setup

Browse Source 
We will add more environment-related code to that new function
in the next patch.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karsten Blees
2016-01-26 15:34:38 +01:00
committed by Junio C Hamano
parent 888ab716ad
commit 02e6edc082
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
compat/mingw.c
View File

@ -2044,6 +2044,22 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen)
return -1; return -1;
} }
static void setup_windows_environment()
{
/* on Windows it is TMP and TEMP */
if (!getenv("TMPDIR")) {
const char *tmp = getenv("TMP");
if (!tmp)
tmp = getenv("TEMP");
if (tmp)
setenv("TMPDIR", tmp, 1);
}
/* simulate TERM to enable auto-color (see color.c) */
if (!getenv("TERM"))
setenv("TERM", "cygwin", 1);
}
/* /*
* Disable MSVCRT command line wildcard expansion (__getmainargs called from * Disable MSVCRT command line wildcard expansion (__getmainargs called from
* mingw startup code, see init.c in mingw runtime). * mingw startup code, see init.c in mingw runtime).
@ -2122,19 +2138,7 @@ void mingw_startup()
qsort(environ, i, sizeof(char*), compareenv); qsort(environ, i, sizeof(char*), compareenv);
/* fix Windows specific environment settings */ /* fix Windows specific environment settings */
setup_windows_environment();
/* 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);
}
/* simulate TERM to enable auto-color (see color.c) */
if (!getenv("TERM"))
setenv("TERM", "cygwin", 1);
/* initialize critical section for waitpid pinfo_t list */ /* initialize critical section for waitpid pinfo_t list */
InitializeCriticalSection(&pinfo_cs); InitializeCriticalSection(&pinfo_cs);