Use forward slashes for Windows home directory.

diff --git a/cups/globals.c b/cups/globals.c
index 46daa18c548af1c9d5a9d0e2cd1e486d1a6a97cb..73e660912ffd2271ce22cb0a54aa7d71333ba467 100644 (file)
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -184,7 +184,8 @@ cups_globals_alloc(void)
 #ifdef _WIN32
   HKEY         key;                    /* Registry key */
   DWORD                size;                   /* Size of string */
-  static char  installdir[1024] = "",  /* Install directory */
+  static char  homedir[1024] = "",     /* Home directory */
+               installdir[1024] = "",  /* Install directory */
                confdir[1024] = "",     /* Server root directory */
                localedir[1024] = "";   /* Locale directory */
 #endif /* _WIN32 */
@@ -274,7 +275,26 @@ cups_globals_alloc(void)
   if ((cg->localedir = getenv("LOCALEDIR")) == NULL)
     cg->localedir = localedir;
 
-  cg->home = getenv("USERPROFILE");
+  if (!homedir[0])
+  {
+    const char *userprofile = getenv("USERPROFILE");
+                               // User profile (home) directory
+    char       *homeptr;       // Pointer into homedir
+
+    DEBUG_printf(("cups_globals_alloc: USERPROFILE=\"%s\"", userprofile));
+
+    strlcpy(homedir, userprofile, sizeof(homedir));
+    for (homeptr = homedir; *homeptr; homeptr ++)
+    {
+      // Convert back slashes to forward slashes
+      if (*homeptr == '\\')
+        *homeptr = '/';
+    }
+
+    DEBUG_printf(("cups_globals_alloc: homedir=\"%s\"", homedir));
+  }
+
+  cg->home = homedir;
 
 #else
 #  ifdef HAVE_GETEUID