Changeset 59228 in vbox

Timestamp:

Dec 29, 2015 2:26:00 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104856

Message:

GetVBoxUserHomeDirectory: Use RTEnvGetEx when reading XDG_CONFIG_HOME just like we do already for VBOX_USER_HOME. Also, should it or the following path append fail in anyway, fall back on .config/VirtualBox

File:

• trunk/src/VBox/Main/glue/com.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/com.cpp

@@ -56 +56 @@
 
 #if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS)
-char szXdgConfigHome[RTPATH_MAX] = "";
+char g_szXdgConfigHome[RTPATH_MAX] = "";
 #endif
 
@@ -67 +67 @@
  * legacy) if none do.
  */
-const char *const apcszUserHome[] =
+const char * const g_apcszUserHome[] =
 #ifdef RT_OS_DARWIN
 { "Library/VirtualBox" };
@@ -73 +73 @@
 { ".VirtualBox" };
 #else
-{ ".VirtualBox", szXdgConfigHome };
+{ ".VirtualBox", g_szXdgConfigHome };
 #endif
 
@@ -233 +233 @@
         {
 #if !defined(RT_OS_WINDOWS) && !defined(RT_OS_DARWIN)
-            const char *pcszConfigHome = RTEnvGet("XDG_CONFIG_HOME");
-            if (pcszConfigHome && pcszConfigHome[0])
+            vrc = RTEnvGetEx(RTENV_DEFAULT, "XDG_CONFIG_HOME", g_szXdgConfigHome, sizeof(g_szXdgConfigHome), NULL);
+            if (RT_SUCCESS(vrc))
+                vrc = RTPathAppend(g_szXdgConfigHome, sizeof(g_szXdgConfigHome), "VirtualBox");
+            AssertMsg(vrc == VERR_ENV_VAR_NOT_FOUND, ("%Rrc\n", vrc));
+            if (RT_FAILURE_NP(vrc))
+                vrc = RTStrCopy(g_szXdgConfigHome, sizeof(g_szXdgConfigHome), ".config/VirtualBox");
+#endif
+            for (unsigned i = 0; i < RT_ELEMENTS(g_apcszUserHome); ++i)
             {
-                vrc = RTStrCopy(szXdgConfigHome,
-                                sizeof(szXdgConfigHome),
-                                pcszConfigHome);
-                if (RT_SUCCESS(vrc))
-                    vrc = RTPathAppend(szXdgConfigHome,
-                                       sizeof(szXdgConfigHome),
-                                       "VirtualBox");
-            }
-            else
-                vrc = RTStrCopy(szXdgConfigHome,
-                                sizeof(szXdgConfigHome),
-                                ".config/VirtualBox");
-#endif
-            for (unsigned i = 0; i < RT_ELEMENTS(apcszUserHome); ++i)
-            {
-                vrc = composeHomePath(aDir, aDirLen, apcszUserHome[i]);
+                vrc = composeHomePath(aDir, aDirLen, g_apcszUserHome[i]);
                 if (   RT_SUCCESS(vrc)
                     && RTDirExists(aDir))