Changeset 97152 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

Timestamp:

Oct 14, 2022 8:14:05 AM (3 years ago)

Author:

vboxsync

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

154125

Message:

Main/Guest Control: Resolved some @todos: Hand-in RTDIRENTRYEX in FsList::AddDirFromHost() so that we don't need to re-create this on the stack each and every time we (recursively) call this function. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1210 +1210 @@
  *                              Needed for recursion.
  * @param  cbPathReal           Size (in bytes) of \a pszPathReal.
+ * @param  pDirEntry            Where to store looked up directory information for handled paths.
+ *                              Needed for recursion.
  */
 int FsList::AddDirFromHost(const Utf8Str &strPath, const Utf8Str &strSubDir,
-                           char *pszPathReal, size_t cbPathReal)
+                           char *pszPathReal, size_t cbPathReal, PRTDIRENTRYEX pDirEntry)
 {
     Utf8Str strPathAbs = strPath;
@@ -1249 +1251 @@
                     {
                         /* Retrieve the next directory entry. */
-                        RTDIRENTRYEX Entry;
-                        vrc = RTDirReadEx(hDir, &Entry, NULL, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+                        vrc = RTDirReadEx(hDir, pDirEntry, NULL, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
                         if (RT_FAILURE(vrc))
                         {
@@ -1258 +1259 @@
                         }
 
-                        Utf8Str strEntry = strPathSub + Utf8Str(Entry.szName);
+                        Utf8Str strEntry = strPathSub + Utf8Str(pDirEntry->szName);
 
                         LogFlowFunc(("Entry '%s'\n", strEntry.c_str()));
 
-                        switch (Entry.Info.Attr.fMode & RTFS_TYPE_MASK)
+                        switch (pDirEntry->Info.Attr.fMode & RTFS_TYPE_MASK)
                         {
                             case RTFS_TYPE_DIRECTORY:
                             {
                                 /* Skip "." and ".." entries. */
-                                if (RTDirEntryExIsStdDotLink(&Entry))
+                                if (RTDirEntryExIsStdDotLink(pDirEntry))
                                     break;
 
@@ -1275 +1276 @@
                                     break;
 
-                                vrc = AddDirFromHost(strPath, strEntry, pszPathReal, cbPathReal);
+                                vrc = AddDirFromHost(strPath, strEntry, pszPathReal, cbPathReal, pDirEntry);
                                 break;
                             }
@@ -1283 +1284 @@
                                 LogRel2(("Guest Control: File '%s'\n", strEntry.c_str()));
 
-                                vrc = AddEntryFromHost(strEntry, &Entry.Info);
+                                vrc = AddEntryFromHost(strEntry, &pDirEntry->Info);
                                 break;
                             }
@@ -1291 +1292 @@
                                 if (mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks)
                                 {
-                                    Utf8Str strEntryAbs = strPathAbs + (const char *)Entry.szName;
+                                    Utf8Str strEntryAbs = strPathAbs + (const char *)pDirEntry->szName;
 
                                     vrc = RTPathReal(strEntryAbs.c_str(), pszPathReal, cbPathReal);
@@ -1303 +1304 @@
                                                 LogRel2(("Guest Control: Symbolic link '%s' -> '%s' (directory)\n",
                                                          strEntryAbs.c_str(), pszPathReal));
-                                                vrc = AddDirFromHost(strPath, strEntry, pszPathReal, cbPathReal);
+                                                vrc = AddDirFromHost(strPath, strEntry, pszPathReal, cbPathReal, pDirEntry);
                                             }
                                             else if (RTFS_IS_FILE(objInfo.Attr.fMode))
@@ -1809 +1810 @@
                     {
                         char szPathReal[RTPATH_MAX];
-                        vrc = pFsList->AddDirFromHost(strSrc /* strPath */, "" /* strSubDir */, szPathReal, sizeof(szPathReal));
+                        RTDIRENTRYEX DirEntry;
+                        vrc = pFsList->AddDirFromHost(strSrc /* strPath */, "" /* strSubDir */,
+                                                      szPathReal, sizeof(szPathReal), &DirEntry);
                     }
                     else