Changeset 78090 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Apr 10, 2019 2:19:04 PM (6 years ago)

Author:

vboxsync

Message:

*,IPRT: Use new RTPathAbsExEx function instead of RTPathAbsEx. bugref:9172

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -7258 +7258 @@
 
     strSettingsDir.stripFilename();
-    char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(strSettingsDir.c_str(), strPath.c_str(), folder, sizeof(folder));
+    char szFolder[RTPATH_MAX];
+    size_t cbFolder = sizeof(szFolder);
+    int vrc = RTPathAbsExEx(strSettingsDir.c_str(), strPath.c_str(), RTPATH_STR_F_STYLE_HOST, szFolder, &cbFolder);
     if (RT_SUCCESS(vrc))
-        aResult = folder;
+        aResult = szFolder;
 
     return vrc;

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -4010 +4010 @@
     AssertComRCReturn(autoCaller.rc(), VERR_GENERAL_FAILURE);
 
-    /* no need to lock since mHomeDir is const */
-
-    char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(m->strHomeDir.c_str(),
-                          strPath.c_str(),
-                          folder,
-                          sizeof(folder));
+    /* no need to lock since strHomeDir is const */
+
+    char szFolder[RTPATH_MAX];
+    size_t cbFolder = sizeof(szFolder);
+    int vrc = RTPathAbsExEx(m->strHomeDir.c_str(),
+                            strPath.c_str(),
+                            RTPATH_STR_F_STYLE_HOST,
+                            szFolder,
+                            &cbFolder);
     if (RT_SUCCESS(vrc))
-        aResult = folder;
+        aResult = szFolder;
 
     return vrc;