Changeset 81361 in vbox

Timestamp:

Oct 18, 2019 5:22:44 PM (5 years ago)

Author:

vboxsync

Message:

bugref:8345. replace wrong usage Utf8Str::contains() by RTPathStartsWith().

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (7 diffs)

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

@@ -170 +170 @@
     uint32_t cbSector = 0;
 
+
     int vrc = RTFsQuerySizes(strTargetFolder.c_str(), &cbTotal, &cbFree, &cbBlock, &cbSector);
     if (FAILED(vrc))
@@ -249 +250 @@
     strLogFolder = bstr_logFolder;
     if (   m_type.equals("basic")
-        && strLogFolder.contains(strSettingsFilePath))
+        && RTPathStartsWith(strLogFolder.c_str(), strSettingsFilePath.c_str()))
         m_vmFolders.insert(std::make_pair(VBox_LogFolder, strLogFolder));
 
@@ -265 +266 @@
         strStateFilePath.stripFilename();
         if (   m_type.equals("basic")
-            && strStateFilePath.contains(strSettingsFilePath))
+            && RTPathStartsWith(strStateFilePath.c_str(), strSettingsFilePath.c_str()))
             m_vmFolders.insert(std::make_pair(VBox_StateFolder, strStateFilePath));
     }
@@ -277 +278 @@
     strSnapshotFolder = bstr_snapshotFolder;
     if (   m_type.equals("basic")
-        && strSnapshotFolder.contains(strSettingsFilePath))
+        && RTPathStartsWith(strSnapshotFolder.c_str(), strSettingsFilePath.c_str()))
         m_vmFolders.insert(std::make_pair(VBox_SnapshotFolder, strSnapshotFolder));
 
@@ -391 +392 @@
             Utf8Str name = sst.strSaveStateFile;
             /*if a state file is located in the actual VM folder it will be added to the actual list */
-            if (name.contains(strSettingsFilePath))
+            if (RTPathStartsWith(name.c_str(), strSettingsFilePath.c_str()))
             {
                 vrc = RTFileQuerySizeByPath(name.c_str(), &cbFile);
@@ -1184 +1185 @@
              * Maybe the more clever check is needed in the some corner cases.
              */
-            if (!path.contains(targetPath))
+            if (!RTPathStartsWith(path.c_str(), targetPath.c_str()))
                 m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
                                                                    targetPath.c_str(),
@@ -1433 +1434 @@
                 mt.strBaseName = bstrLocation;
                 Utf8Str const &strFolder = m_vmFolders[VBox_SnapshotFolder];
-                if (strFolder.isNotEmpty() && mt.strBaseName.contains(strFolder)) /** @todo r=bird: contains? Shouldn't it be startsWith and take mixed slashes (windows) and stuff into account? */
+                
+                if (strFolder.isNotEmpty() && RTPathStartsWith(mt.strBaseName.c_str(), strFolder.c_str()))
                     mt.fSnapshot = true;
                 else