Skip to content

Commit 45d767f

Browse files
committed
mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 92f4c43 commit 45d767f

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

compat/mingw.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2631,6 +2631,18 @@ static size_t append_system_bin_dirs(char *path, size_t size)
26312631
}
26322632
#endif
26332633

2634+
static int is_system32_path(const char *path)
2635+
{
2636+
WCHAR system32[MAX_PATH], wpath[MAX_PATH];
2637+
2638+
if (xutftowcs_path(wpath, path) < 0 ||
2639+
!GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
2640+
_wcsicmp(system32, wpath))
2641+
return 0;
2642+
2643+
return 1;
2644+
}
2645+
26342646
static void setup_windows_environment(void)
26352647
{
26362648
char *tmp = getenv("TMPDIR");
@@ -2671,7 +2683,8 @@ static void setup_windows_environment(void)
26712683
strbuf_addstr(&buf, tmp);
26722684
if ((tmp = getenv("HOMEPATH"))) {
26732685
strbuf_addstr(&buf, tmp);
2674-
if (is_directory(buf.buf))
2686+
if (!is_system32_path(buf.buf) &&
2687+
is_directory(buf.buf))
26752688
setenv("HOME", buf.buf, 1);
26762689
else
26772690
tmp = NULL; /* use $USERPROFILE */

0 commit comments

Comments
 (0)