Changeset 108317 in vbox

Timestamp:

Feb 20, 2025 5:14:58 PM (3 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167661

Message:

Main/MachineImplMoveVM: IMachine::moveTo() wouldn't move all of a VM's
files to the new location on Solaris hosts since MachineMoveVM::getFilesList()
uses RTDirRead() to read the contents of the VM's directory but the
entries had an unknown entry type (RTDIRENTRYTYPE_UNKNOWN) since 'struct
dirent' on Solaris doesn't have a 'd_type' entry. In such instances we
need to fallback to RTDirQueryUnknownType() to retrieve the details of
each entry in the directory.

File:

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

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

@@ -1285 +1285 @@
     {
         /** @todo r=bird: RTDIRENTRY is big and this function is doing
-         * unrestrained recursion of arbritrary depth.  Four things:
+         * unrestrained recursion of arbritrary depth.  Three things:
          *      - Add a depth counter parameter and refuse to go deeper than
          *        a certain reasonable limit.
@@ -1295 +1295 @@
          *        entry with a name longer than RTDIRENTRY have space to
          *        store (windows host with UTF-16 encoding shorter than 255
-         *        chars, but UTF-8 encoding longer than 260).
-         *      - enmType can be RTDIRENTRYTYPE_UNKNOWN if the file system or
-         *        the host doesn't return the information.  See
-         *        RTDIRENTRY::enmType.  Use RTDirQueryUnknownType() to get the
-         *        actual type. */
+         *        chars, but UTF-8 encoding longer than 260). */
         RTDIRENTRY DirEntry;
         while (RT_SUCCESS(RTDirRead(hDir, &DirEntry, NULL)))
@@ -1305 +1301 @@
             if (RTDirEntryIsStdDotLink(&DirEntry))
                 continue;
+
+            /* Make sure we've got the entry type. */
+            if (DirEntry.enmType == RTDIRENTRYTYPE_UNKNOWN)
+            {
+                /* Build the complete path which is needed by RTDirQueryUnknownType(). */
+                char szPath[RTPATH_MAX];
+                vrc = RTPathJoin(szPath, sizeof(szPath), strRootFolder.c_str(), DirEntry.szName);
+                if (RT_SUCCESS(vrc))
+                    vrc = RTDirQueryUnknownType(szPath, false /*fFollowSymlinks*/, &DirEntry.enmType);
+                if (RT_FAILURE(vrc))
+                    continue;
+            }
 
             if (DirEntry.enmType == RTDIRENTRYTYPE_FILE)