Changeset 34837 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2010 2:37:42 PM (14 years ago)

Author:

vboxsync

Message:

Main/Settings: always use forward slashes in media & snapshot folder paths to make things more portable between windows & other OSes

Location:

trunk/src/VBox/Main

Files:

• glue/string.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (4 diffs)

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

@@ -97 +97 @@
 }
 
+Utf8Str& Utf8Str::useForwardSlashes()
+{
+    for (size_t i = 0; i < length(); ++i)
+    {
+        char *p = &m_psz[i];
+        if (*p == '\\')
+            *p = '/';
+    }
+
+    return *this;
+}
+
 /**
  * Internal function used in Utf8Str copy constructors and assignment when

trunk/src/VBox/Main/xml/Settings.cpp

@@ -646 +646 @@
 
             if (fNeedsFilePath)
+            {
                 if (!(pelmImage->getAttributeValue("filePath", med.strLocation)))
                     throw ConfigFileError(this, &elmMedium, N_("Required %s/@filePath attribute is missing"), elmMedium.getName());
+                else
+                    // IPRT can handle forward slashes in file paths everywhere, but there might be
+                    // backslashes in the settings file, so convert them into forward slashes.
+                    med.strLocation.useForwardSlashes();
+            }
         }
 
@@ -1002 +1008 @@
 
     pelmMedium->setAttribute("uuid", mdm.uuid.toStringCurly());
-    pelmMedium->setAttribute("location", mdm.strLocation);
+
+    // always use forward slashes when writing out settings, never '\'
+    Utf8Str strLocation(mdm.strLocation);
+    strLocation.useForwardSlashes();
+    pelmMedium->setAttribute("location", strLocation);
+
     pelmMedium->setAttribute("format", mdm.strFormat);
     if (mdm.fAutoReset)
@@ -3168 +3179 @@
         if (elmMachine.getAttributeValue("currentSnapshot", str))
             parseUUID(uuidCurrentSnapshot, str);
+
         elmMachine.getAttributeValue("snapshotFolder", machineUserData.strSnapshotFolder);
+        // IPRT can handle forward slashes in file paths everywhere, but there might be
+        // backslashes in the settings file, so convert them into forward slashes.
+        machineUserData.strSnapshotFolder.useForwardSlashes();
+
         if (!elmMachine.getAttributeValue("currentStateModified", fCurrentStateModified))
             fCurrentStateModified = true;
@@ -4190 +4206 @@
          && !uuidCurrentSnapshot.isEmpty())
         elmMachine.setAttribute("currentSnapshot", uuidCurrentSnapshot.toStringCurly());
+
     if (machineUserData.strSnapshotFolder.length())
-        elmMachine.setAttribute("snapshotFolder", machineUserData.strSnapshotFolder);
+    {
+        // always use forward slashes when writing out settings, never '\'
+        Utf8Str strSnapshotFolder(machineUserData.strSnapshotFolder);
+        strSnapshotFolder.useForwardSlashes();
+        elmMachine.setAttribute("snapshotFolder", strSnapshotFolder);
+    }
     if (!fCurrentStateModified)
         elmMachine.setAttribute("currentStateModified", fCurrentStateModified);