Changeset 39794 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 18, 2012 1:17:15 PM (13 years ago)

Author:

vboxsync

Message:

VBoxManage/GuestCtrl: Handle inaccessible directories more gently, verbose logging adjustments.

File:

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

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

@@ -1019 +1019 @@
     {
         *ppszTranslated = RTStrDup(szTranslated);
-#ifdef DEBUG
+#if 0
         RTPrintf("Root: %s, Source: %s, Dest: %s, Translated: %s\n",
                  pszSourceRoot, pszSource, pszDest, *ppszTranslated);
@@ -1319 +1319 @@
     else
     {
-        rc = showProgress(progress);
-        CHECK_PROGRESS_ERROR(progress, ("File copy failed"));
+        if (pContext->fVerbose)
+        {
+            rc = showProgress(progress);
+            CHECK_PROGRESS_ERROR(progress, ("File copy failed"));
+        }
         if (FAILED(rc))
             vrc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
@@ -1557 +1560 @@
                 case GuestDirEntryType_Directory:
                 {
+                    Assert(!strName.isEmpty());
+
                     /* Skip "." and ".." entries. */
                     if (   !strName.compare(Bstr("."))
@@ -1603 +1608 @@
                 case GuestDirEntryType_File:
                 {
+                    Assert(!strName.isEmpty());
+
                     Utf8Str strFile(strName);
                     if (   pszFilter
@@ -1650 +1657 @@
 
                 default:
+                    RTPrintf("Warning: Directory entry of type %ld not handled, skipping ...\n",
+                             enmType);
                     break;
             }
@@ -1657 +1666 @@
         }
 
-        if (FAILED(hr))
-        {
-            if (hr != E_ABORT)
-                rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
+        if (RT_UNLIKELY(FAILED(hr)))
+        {
+            switch (hr)
+            {
+                case E_ABORT: /* No more directory entries left to process. */
+                    break;
+
+                case VBOX_E_FILE_ERROR: /* Current entry cannot be accessed to
+                                           to missing rights. */
+                {
+                    RTPrintf("Warning: Cannot access \"%s\", skipping ...\n",
+                             szCurDir);
+                    break;
+                }
+
+                default:
+                    rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
+                    break;
+            }
         }
 
@@ -2345 +2369 @@
         else
         {
-            rc = showProgress(progress);
-            CHECK_PROGRESS_ERROR(progress, ("Guest additions update failed"));
+            if (fVerbose)
+            {
+                rc = showProgress(progress);
+                CHECK_PROGRESS_ERROR(progress, ("Guest additions update failed"));
+            }
             if (FAILED(rc))
                 vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));