Changeset 44563 in vbox

Timestamp:

Feb 6, 2013 1:15:10 PM (12 years ago)

Author:

vboxsync

Message:

Main: prefer <HOME>/.config/VirtualBox over <HOME>/.VirtualBox for new users on platforms where XDG is relevant, clean-up, and change preferences to always use .VirtualBox if it exists.

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[] = 
+#if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS)
+char szXdgConfigHome[RTPATH_MAX] = "";
+#endif
+
+/**
+ * Possible locations for the VirtualBox user configuration folder,
+ * listed from oldest (as in legacy) to newest.  These can be either
+ * absolute or relative to the home directory.  We use the first entry
+ * of the list which corresponds to a real folder on storage, or
+ * create a folder corresponding to the last in the list (the least
+ * legacy) if none do.
+ */
+const char *const apcszUserHome[] = 
 #ifdef RT_OS_DARWIN
 { "Library/VirtualBox" };
@@ -61 +73 @@
 { ".VirtualBox" };
 #else
-{ ".config/VirtualBox", ".VirtualBox" };
-char szXdgConfigHome[RTPATH_MAX];
+{ ".VirtualBox", szXdgConfigHome };
 #endif
 
@@ -235 +246 @@
                                        sizeof(szXdgConfigHome),
                                        "VirtualBox");
-                    apcszUserHome[0] = szXdgConfigHome;
             }
+            else
+                vrc = RTStrCopy(szXdgConfigHome,
+                                sizeof(szXdgConfigHome),
+                                ".config/VirtualBox");
 #endif
             for (unsigned i = 0; i < RT_ELEMENTS(apcszUserHome); ++i)
@@ -247 +261 @@
                 }
             }
-            if (!fFound)
-                vrc = composeHomePath(aDir, aDirLen, apcszUserHome[0]);
         }