Changeset 38395 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Aug 10, 2011 11:48:29 AM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Update.

File:

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

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

@@ -79 +79 @@
 
 /**
- * An entry for a source element, including an optional filter.
+ * An entry for a source element, including an optional DOS-like wildcard (*,?).
  */
 typedef struct SOURCEFILEENTRY
@@ -93 +93 @@
         {
             /* No file and no directory -- maybe a filter? */
-            if (NULL != strpbrk(RTPathFilename(pszSource), "*?"))
+            char *pszFilename = RTPathFilename(pszSource);
+            if (   pszFilename
+                && strpbrk(pszFilename, "*?"))
             {
                 /* Yep, get the actual filter part. */
@@ -938 +940 @@
     {
         BOOL fDirExists = FALSE;
-        HRESULT hr = pContext->pGuest->FileExists(Bstr(pszDir).raw(),
-                                                  Bstr(pContext->pszUsername).raw(),
-                                                  Bstr(pContext->pszPassword).raw(), &fDirExists);
+        HRESULT hr = pContext->pGuest->DirectoryExists(Bstr(pszDir).raw(),
+                                                       Bstr(pContext->pszUsername).raw(),
+                                                       Bstr(pContext->pszPassword).raw(), &fDirExists);
         if (FAILED(hr))
             rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
@@ -1271 +1273 @@
                 case GuestDirEntryType_File:
                 {
-                    const char *pszName = Utf8Str(strName).c_str();
+                    Utf8Str strFile(strName);
                     if (   !pszFilter
-                        || RTStrSimplePatternMatch(pszFilter, pszName))
+                        || RTStrSimplePatternMatch(pszFilter, strFile.c_str()))
                     {
                         if (!fDirCreated)
@@ -1291 +1293 @@
                         if (RT_SUCCESS(rc))
                         {
-                            Utf8Str strDir(strName);
                             char *pszFileSource;
                             if (RTStrAPrintf(&pszFileSource, "%s/%s",
-                                             szCurDir, strDir.c_str()))
+                                             szCurDir, strFile.c_str()))
                             {
                                 char *pszFileDest;
@@ -1307 +1308 @@
                                 RTStrFree(pszFileSource);
                             }
+                            else
+                                rc = VERR_NO_MEMORY;
                         }
                     }
@@ -1315 +1318 @@
                     break;
             }
-        }
-
-        hr = pContext->pGuest->DirectoryClose(uDirHandle);
-        if (FAILED(rc))
-            rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
+
+            if (RT_FAILURE(rc))
+                break;
+        }
+
+        if (FAILED(hr))
+        {
+            if (hr != E_ABORT)
+                rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
+        }
+
+        HRESULT hr2 = pContext->pGuest->DirectoryClose(uDirHandle);
+        if (FAILED(hr2))
+        {
+            int rc2 = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
+        else if (SUCCEEDED(hr))
+            hr = hr2;
     }
 
@@ -1549 +1567 @@
                 RTPrintf("Source: %s\n", pszSource);
 
-            /* @todo Files with filter?? */
+            /** @todo Files with filter?? */
             bool fExists;
             vrc = ctrlCopyFileExistsOnSource(pContext, pszSource, &fExists);