From 44cb23c5e20c80ba74bbffd4b2350cddb3ada962 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Mon, 6 Apr 2015 20:54:46 +0200
Subject: [PATCH] git-wrapper: fix HOME initialization

git-wrapper fails to initialize HOME correctly if $HOMEDRIVE$HOMEPATH
points to a disconnected network drive.

Check if the directory exists before using $HOMEDRIVE$HOMEPATH.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 compat/win32/git-wrapper.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/compat/win32/git-wrapper.c b/compat/win32/git-wrapper.c
index 1d77a4e5ae..d088d7d05f 100644
--- a/compat/win32/git-wrapper.c
+++ b/compat/win32/git-wrapper.c
@@ -56,13 +56,29 @@ static void setup_environment(LPWSTR exepath, int full_path)
 	if (!GetEnvironmentVariable(L"PLINK_PROTOCOL", NULL, 0))
 		SetEnvironmentVariable(L"PLINK_PROTOCOL", L"ssh");
 
-	/* set HOME to %HOMEDRIVE%%HOMEPATH% or %USERPROFILE%
+	/*
+	 * set HOME to %HOMEDRIVE%%HOMEPATH% or %USERPROFILE%
 	 * With roaming profiles: HOMEPATH is the roaming location and
 	 * USERPROFILE is the local location
 	 */
 	if (!GetEnvironmentVariable(L"HOME", NULL, 0)) {
 		LPWSTR e = NULL;
 		len = GetEnvironmentVariable(L"HOMEPATH", NULL, 0);
+		if (len) {
+			DWORD attr, drvlen = GetEnvironmentVariable(L"HOMEDRIVE", NULL, 0);
+			e = (LPWSTR)malloc(sizeof(WCHAR) * (drvlen + len));
+			drvlen = GetEnvironmentVariable(L"HOMEDRIVE", e, drvlen);
+			GetEnvironmentVariable(L"HOMEPATH", e + drvlen, len);
+			/* check if the path exists */
+			attr = GetFileAttributesW(e);
+			if (attr != INVALID_FILE_ATTRIBUTES
+					&& (attr & FILE_ATTRIBUTE_DIRECTORY))
+				SetEnvironmentVariable(L"HOME", e);
+			else
+				len = 0; /* use USERPROFILE */
+			free(e);
+		}
+
 		if (len == 0) {
 			len = GetEnvironmentVariable(L"USERPROFILE", NULL, 0);
 			if (len != 0) {
@@ -72,15 +88,6 @@ static void setup_environment(LPWSTR exepath, int full_path)
 				free(e);
 			}
 		}
-		else {
-			int n;
-			len += GetEnvironmentVariable(L"HOMEDRIVE", NULL, 0);
-			e = (LPWSTR)malloc(sizeof(WCHAR) * (len + 2));
-			n = GetEnvironmentVariable(L"HOMEDRIVE", e, len);
-			GetEnvironmentVariable(L"HOMEPATH", &e[n], len-n);
-			SetEnvironmentVariable(L"HOME", e);
-			free(e);
-		}
 	}
 
 	/* extend the PATH */