Merge branch 'sverker/erl_interface-win-home/OTP-13849' into maint

* sverker/erl_interface-win-home:
  erl_interface: Look for .erlang.cookie in windows directory
  erl_interface: Refactor get_home()

1 files changed, 24 insertions, 16 deletions

diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 6dc51adee1..624100ad49 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1708,28 +1708,36 @@ error:
 
 static int get_home(char *buf, int size)
 {
-    char* homedrive;
-    char* homepath;
-    
 #ifdef __WIN32__
-    homedrive = getenv("HOMEDRIVE");
-    homepath = getenv("HOMEPATH");
-#else
-    homedrive = "";
-    homepath = getenv("HOME");
-#endif
+    char* homedrive = getenv("HOMEDRIVE");
+    char* homepath = getenv("HOMEPATH");
     
-    if (!homedrive || !homepath) {
-	buf[0] = '.';
-	buf[1] = '\0';
-	return 1;
-    } else if (strlen(homedrive)+strlen(homepath) < size-1) {
+    if (homedrive && homepath) {
+	if (strlen(homedrive)+strlen(homepath) >= size)
+	    return 0;
 	strcpy(buf, homedrive);
 	strcat(buf, homepath);
 	return 1;
     }
-    
-    return 0;
+    else {
+	int len = GetWindowsDirectory(buf, size);
+	if (len) {
+	    return (len < size);
+	}
+    }
+#else
+    char* homepath = getenv("HOME");
+    if (homepath) {
+	if (strlen(homepath) >= size)
+	    return 0;
+	strcpy(buf, homepath);
+	return 1;
+    }
+#endif
+
+    buf[0] = '.';
+    buf[1] = '\0';
+    return 1;
 }