Changeset 33791 in vbox

Timestamp:

Nov 5, 2010 12:55:55 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage/Guest Copy: Support recursive directory handling with file filters.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -630 +630 @@
     int rc = VINF_SUCCESS;
     char szCurDir[RTPATH_MAX];
+    /* Construct current path. */
     if (RTStrPrintf(szCurDir, sizeof(szCurDir), pszRootDir))
     {
         if (pszSubDir != NULL)
             rc = RTPathAppend(szCurDir, sizeof(szCurDir), pszSubDir);
-        if (RT_SUCCESS(rc) && pszFilter != NULL)
-            rc = RTPathAppend(szCurDir, sizeof(szCurDir), pszFilter);
     }
     else
         rc = VERR_NO_MEMORY;
 
-    if (pszFilter)
-        rc = RTDirOpenFiltered(&pDir, szCurDir,
-#ifdef RT_OS_WINDOWS
-                               RTDIRFILTER_WINNT);
-#else
-                               RTDIRFILTER_UNIX);
-#endif
-    else
+    if (RT_SUCCESS(rc))
+    {
+        /* Open directory without a filter - RTDirOpenFiltered unfortunately
+         * cannot handle sub directories so we have to do the filtering ourselves. */
         rc = RTDirOpen(&pDir, szCurDir);
-
-    if (RT_SUCCESS(rc))
-    {
-        for (;;)
+        for (;RT_SUCCESS(rc);)
         {
             RTDIRENTRY DirEntry;
@@ -692 +684 @@
                 case RTDIRENTRYTYPE_FILE:
                 {
-                    char *pszFileSource = NULL;
-                    char *pszFileDest = NULL;
-                    if (RTStrAPrintf(&pszFileSource, "%s%s%s",
-                                     pszRootDir, pszSubDir ? pszSubDir : "",
-                                     DirEntry.szName) >= 0)
+                    bool fProcess = false;
+                    if (pszFilter && RTStrSimplePatternMatch(pszFilter, DirEntry.szName))
+                        fProcess = true;
+                    else if (!pszFilter)
+                        fProcess = true;
+
+                    if (fProcess)
                     {
-                        if (RTStrAPrintf(&pszFileDest, "%s%s",
-                                         pszSubDir ? pszSubDir : "",
-                                         DirEntry.szName) <= 0)
+                        char *pszFileSource = NULL;
+                        char *pszFileDest = NULL;
+                        if (RTStrAPrintf(&pszFileSource, "%s%s%s",
+                                         pszRootDir, pszSubDir ? pszSubDir : "",
+                                         DirEntry.szName) >= 0)
                         {
+                            if (RTStrAPrintf(&pszFileDest, "%s%s",
+                                             pszSubDir ? pszSubDir : "",
+                                             DirEntry.szName) <= 0)
+                            {
+                                rc = VERR_NO_MEMORY;
+                            }
+                        }
+                        else
                             rc = VERR_NO_MEMORY;
+
+                        if (RT_SUCCESS(rc))
+                        {
+                            rc = ctrlCopyDirectoryEntryAppend(pszFileSource, pszFileDest, pList);
+                            if (RT_SUCCESS(rc))
+                                *pcObjects = *pcObjects + 1;
                         }
+
+                        if (pszFileSource)
+                            RTStrFree(pszFileSource);
+                        if (pszFileDest)
+                            RTStrFree(pszFileDest);
                     }
-                    else
-                        rc = VERR_NO_MEMORY;
-
-                    if (RT_SUCCESS(rc))
-                    {
-                        rc = ctrlCopyDirectoryEntryAppend(pszFileSource, pszFileDest, pList);
-                        if (RT_SUCCESS(rc))
-                            *pcObjects = *pcObjects + 1;
-                    }
-
-                    if (pszFileSource)
-                        RTStrFree(pszFileSource);
-                    if (pszFileDest)
-                        RTStrFree(pszFileDest);
-                    break;
-                }
+                }
+                break;
 
                 case RTDIRENTRYTYPE_SYMLINK: