SDL: fix HOME path variable for Win32

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2020-02-13 (0.12.18)
+	Fix path for HOME constant
+
 2020-02-08 (0.12.18)
 	SDL: fix issue #81 - numlock handling
 	FLTK: added live editing menu item

src/common/brun.c

@@ -272,10 +272,14 @@ void exec_setup_predefined_variables() {
   if (getenv("HOME_DIR")) {
     strlcpy(homedir, getenv("HOME_DIR"), sizeof(homedir));
   }
-#else
-#if defined(_Win32)
+#elif defined(_Win32)
   if (getenv("HOMEPATH")) {
-    strlcpy(homedir, getenv("HOMEPATH"), sizeof(homedir));
+    if (getenv("HOMEDRIVE")) {
+      strlcpy(homedir, getenv("HOMEDRIVE"), sizeof(homedir));
+      strlcat(homedir, getenv("HOMEPATH"), sizeof(homedir));
+    } else {
+      strlcpy(homedir, getenv("HOMEPATH"), sizeof(homedir));
+    }
   } else {
     GetModuleFileName(NULL, homedir, sizeof(homedir) - 1);
     char *p = strrchr(homedir, '\\');
@@ -295,12 +299,11 @@ void exec_setup_predefined_variables() {
     strcpy(homedir, "/tmp/");
   }
 #endif
+  // don't end with trailing slash
   int l = strlen(homedir);
-  if (homedir[l - 1] != OS_DIRSEP) {
-    homedir[l] = OS_DIRSEP;
-    homedir[l + 1] = '\0';
+  if (homedir[l - 1] == OS_DIRSEP) {
+    homedir[l - 1] = '\0';
   }
-#endif
   setsysvar_str(SYSVAR_HOME, homedir);
 }
 

src/common/proc.c

@@ -67,7 +67,8 @@ int sys_search_path(const char *path, const char *file, char *retbuf) {
       if (getenv("HOME")) {
         strlcpy(cur_path, getenv("HOME"), sizeof(cur_path));
       } else {
-        strlcpy(cur_path, getenv("HOMEPATH"), sizeof(cur_path));
+        strlcpy(cur_path, getenv("HOMEDRIVE"), sizeof(cur_path));
+        strlcat(cur_path, getenv("HOMEPATH"), sizeof(cur_path));
       }
       strlcat(cur_path, "/", sizeof(cur_path));
       strlcat(cur_path, old_path, sizeof(cur_path));

src/platform/android/app/src/main/assets/main.bas

@@ -73,7 +73,8 @@ func mk_scratch()
       result = true
     catch e
       local wnd = window()
-      wnd.alert("Failed to create scratch file: " + e)
+      logprint e
+      wnd.alert("Failed to create: " + scratch_file)
     end try
   else
     result = true