Changeset 44545 in vbox

Timestamp:

Feb 5, 2013 2:19:49 PM (12 years ago)

Author:

vboxsync

Message:

Main: prefer <HOME>/.config/VirtualBox over <HOME>/.VirtualBox for new users on platforms where XDG is relevant.

File:

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

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

@@ -55 +55 @@
 #include <VBox/version.h>
 
+const char *apcszUserHome[] = 
 #ifdef RT_OS_DARWIN
-# define VBOX_USER_HOME_SUFFIX   "Library/VirtualBox"
+{ "Library/VirtualBox" };
+#elif defined RT_OS_WINDOWS
+{ ".VirtualBox" };
 #else
-# define VBOX_USER_HOME_SUFFIX   ".VirtualBox"
+{ ".config/VirtualBox", ".VirtualBox" };
 #endif
 
@@ -182 +185 @@
 #endif // VBOX_WITH_XPCOM
 
+static int composeHomePath(char *aDir, size_t aDirLen,
+                           const char *pcszBase)
+{
+    int vrc;
+    if (RTPathStartsWithRoot(pcszBase))
+        vrc = RTStrCopy(aDir, aDirLen, pcszBase);
+    else
+    {
+        /* compose the config directory (full path) */
+        /** @todo r=bird: RTPathUserHome doesn't necessarily return a
+         * full (abs) path like the comment above seems to indicate. */
+        vrc = RTPathUserHome(aDir, aDirLen);
+        if (RT_SUCCESS(vrc))
+            vrc = RTPathAppend(aDir, aDirLen, pcszBase);
+    }
+    return vrc;
+}
+
 int GetVBoxUserHomeDirectory(char *aDir, size_t aDirLen, bool fCreateDir)
 {
@@ -194 +215 @@
     if (RT_SUCCESS(vrc) || vrc == VERR_ENV_VAR_NOT_FOUND)
     {
+        bool fFound = false;
         if (RT_SUCCESS(vrc))
         {
@@ -201 +223 @@
         else
         {
-            /* compose the config directory (full path) */
-            /** @todo r=bird: RTPathUserHome doesn't necessarily return a full (abs) path
-             *        like the comment above seems to indicate. */
-            vrc = RTPathUserHome(aDir, aDirLen);
-            if (RT_SUCCESS(vrc))
-                vrc = RTPathAppend(aDir, aDirLen, VBOX_USER_HOME_SUFFIX);
+#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_DARWIN)
+            const char *pcszConfigHome = RTEnvGet("XDG_CONFIG_HOME");
+            if (pcszConfigHome && pcszConfigHome[0])
+                apcszUserHome[0] = pcszConfigHome;
+#endif
+            for (unsigned i = 0; i < RT_ELEMENTS(apcszUserHome); ++i)
+            {
+                vrc = composeHomePath(aDir, aDirLen, apcszUserHome[i]);
+                if (RTDirExists(aDir))
+                {
+                    fFound = true;
+                    break;
+                }
+            }
+            if (!fFound)
+                vrc = composeHomePath(aDir, aDirLen, apcszUserHome[0]);
         }
 
         /* ensure the home directory exists */
         if (RT_SUCCESS(vrc))
-            if (!RTDirExists(aDir) && fCreateDir)
+            if (!fFound && fCreateDir)
                 vrc = RTDirCreateFullPath(aDir, 0700);
     }