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

Timestamp:

Dec 1, 2010 10:13:08 AM (14 years ago)

Author:

vboxsync

Message:

Guest Copy/CreateDirectory: Bugfixes, improved error handling.

File:

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

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

@@ -172 +172 @@
 }
 
-static int ctrlPrintError(ComPtr<IUnknown> object, const GUID &aIID)
-{
-    com::ErrorInfo info(object, aIID);
-    if (   info.isFullAvailable()
-        || info.isBasicAvailable())
+static int ctrlPrintError(com::ErrorInfo &errorInfo)
+{
+    if (   errorInfo.isFullAvailable()
+        || errorInfo.isBasicAvailable())
     {
         /* If we got a VBOX_E_IPRT error we handle the error in a more gentle way
          * because it contains more accurate info about what went wrong. */
-        if (info.getResultCode() == VBOX_E_IPRT_ERROR)
-            RTMsgError("%ls.", info.getText().raw());
+        if (errorInfo.getResultCode() == VBOX_E_IPRT_ERROR)
+            RTMsgError("%ls.", errorInfo.getText().raw());
         else
         {
             RTMsgError("Error details:");
-            GluePrintErrorInfo(info);
+            GluePrintErrorInfo(errorInfo);
         }
         return VERR_GENERAL_FAILURE; /** @todo */
@@ -191 +190 @@
     AssertMsgFailedReturn(("Object has indicated no error!?\n"),
                           VERR_INVALID_PARAMETER);
+}
+
+static int ctrlPrintProgressError(ComPtr<IProgress> progress)
+{
+    return ctrlPrintError(com::ProgressErrorInfo(progress));
 }
 
@@ -430 +434 @@
         if (FAILED(rc))
         {
-            vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
+            vrc = ctrlPrintError(com::ErrorInfo(guest, COM_IIDOF(IGuest)));
         }
         else
@@ -486 +490 @@
                         if (FAILED(rc))
                         {
-                            vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
+                            vrc = ctrlPrintError(com::ErrorInfo(guest, COM_IIDOF(IGuest)));
 
                             cbOutputData = 0;
@@ -560 +564 @@
                          && SUCCEEDED(rc))
                 {
-                    LONG iRc = false;
+                    LONG iRc;
                     CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
                     if (FAILED(iRc))
                     {
-                        vrc = ctrlPrintError(progress, COM_IIDOF(IProgress));
+                        vrc = ctrlPrintProgressError(progress);
                     }
                     else if (fVerbose)
@@ -590 +594 @@
 
 /**
- * Appends a new to-copy object to a copy list.
+ * Appends a new file/directory entry to a given list.
  *
  * @return  IPRT status code.
- * @param   pszFileSource       Full qualified source path of file to copy.
- * @param   pszFileDest         Full qualified destination path.
+ * @param   pszFileSource       Full qualified source path of file to copy (optional).
+ * @param   pszFileDest         Full qualified destination path (optional).
  * @param   pList               Copy list used for insertion.
  */
-static int ctrlCopyDirectoryEntryAppend(const char *pszFileSource, const char *pszFileDest,
-                                        PRTLISTNODE pList)
-{
-    AssertPtrReturn(pszFileSource, VERR_INVALID_POINTER);
-    AssertPtrReturn(pszFileDest, VERR_INVALID_POINTER);
+static int ctrlDirectoryEntryAppend(const char *pszFileSource, const char *pszFileDest,
+                                    PRTLISTNODE pList)
+{
     AssertPtrReturn(pList, VERR_INVALID_POINTER);
+    AssertReturn(pszFileSource || pszFileDest, VERR_INVALID_PARAMETER);
 
     PDIRECTORYENTRY pNode = (PDIRECTORYENTRY)RTMemAlloc(sizeof(DIRECTORYENTRY));
@@ -608 +611 @@
         return VERR_NO_MEMORY;
 
-    pNode->pszSourcePath = RTStrDup(pszFileSource);
-    pNode->pszDestPath = RTStrDup(pszFileDest);
-    if (   !pNode->pszSourcePath
-        || !pNode->pszDestPath)
-    {
-        return VERR_NO_MEMORY;
+    pNode->pszSourcePath = NULL;
+    pNode->pszDestPath = NULL;
+
+    if (pszFileSource)
+    {
+        pNode->pszSourcePath = RTStrDup(pszFileSource);
+        AssertPtrReturn(pNode->pszSourcePath, VERR_NO_MEMORY);
+    }
+    if (pszFileDest)
+    {
+        pNode->pszDestPath = RTStrDup(pszFileDest);
+        AssertPtrReturn(pNode->pszDestPath, VERR_NO_MEMORY);
     }
 
@@ -621 +630 @@
     return VINF_SUCCESS;
 }
+
+/**
+ * Destroys a directory list.
+ *
+ * @param   pList               Pointer to list to destroy.
+ */
+static void ctrlDirectoryListDestroy(PRTLISTNODE pList)
+{
+    AssertPtr(pList);
+
+    /* Destroy file list. */
+    PDIRECTORYENTRY pNode = RTListGetFirst(pList, DIRECTORYENTRY, Node);
+    while (pNode)
+    {
+        PDIRECTORYENTRY pNext = RTListNodeGetNext(&pNode->Node, DIRECTORYENTRY, Node);
+        bool fLast = RTListNodeIsLast(pList, &pNode->Node);
+
+        if (pNode->pszSourcePath)
+            RTStrFree(pNode->pszSourcePath);
+        if (pNode->pszDestPath)
+            RTStrFree(pNode->pszDestPath);
+        RTListNodeRemove(&pNode->Node);
+        RTMemFree(pNode);
+
+        if (fLast)
+            break;
+
+        pNode = pNext;
+    }
+}
+
 
 /**
@@ -743 +783 @@
                         if (RT_SUCCESS(rc))
                         {
-                            rc = ctrlCopyDirectoryEntryAppend(pszFileSource, pszFileDest, pList);
+                            rc = ctrlDirectoryEntryAppend(pszFileSource, pszFileDest, pList);
                             if (RT_SUCCESS(rc))
                                 *pcObjects = *pcObjects + 1;
@@ -819 +859 @@
                 {
                     RTListInit(pList);
-                    rc = ctrlCopyDirectoryEntryAppend(pszSourceAbs, pszDestAbs, pList);
+                    rc = ctrlDirectoryEntryAppend(pszSourceAbs, pszDestAbs, pList);
                     *pcObjects = 1;
                 }
@@ -900 +940 @@
         rc = VERR_NO_MEMORY;
     return rc;
-}
-
-/**
- * Destroys a copy list.
- */
-static void ctrlCopyDestroy(PRTLISTNODE pList)
-{
-    AssertPtr(pList);
-
-    /* Destroy file list. */
-    PDIRECTORYENTRY pNode = RTListGetFirst(pList, DIRECTORYENTRY, Node);
-    while (pNode)
-    {
-        PDIRECTORYENTRY pNext = RTListNodeGetNext(&pNode->Node, DIRECTORYENTRY, Node);
-        bool fLast = RTListNodeIsLast(pList, &pNode->Node);
-
-        if (pNode->pszSourcePath)
-            RTStrFree(pNode->pszSourcePath);
-        if (pNode->pszDestPath)
-            RTStrFree(pNode->pszDestPath);
-        RTListNodeRemove(&pNode->Node);
-        RTMemFree(pNode);
-
-        if (fLast)
-            break;
-
-        pNode = pNext;
-    }
 }
 
@@ -957 +969 @@
     if (FAILED(rc))
     {
-        vrc = ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+        vrc = ctrlPrintError(com::ErrorInfo(pGuest, COM_IIDOF(IGuest)));
     }
     else
@@ -1004 +1016 @@
                  && SUCCEEDED(rc))
         {
-            LONG iRc = false;
+            LONG iRc;
             CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
             if (FAILED(iRc))
-                vrc = ctrlPrintError(progress, COM_IIDOF(IProgress));
+                vrc = ctrlPrintProgressError(progress);
         }
     }
@@ -1106 +1118 @@
                 }
                 uNoOptionIdx++;
+                if (uNoOptionIdx == UINT32_MAX)
+                {
+                    RTMsgError("Too many files specified! Aborting.\n");
+                    vrc = VERR_TOO_MUCH_DATA;
+                }
                 break;
             }
@@ -1194 +1211 @@
                     RTStrFree(pszDestPath);
                     if (FAILED(rc))
-                        vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
+                        vrc = ctrlPrintError(com::ErrorInfo(guest, COM_IIDOF(IGuest)));
                     else
                     {
@@ -1217 +1234 @@
                     RTPrintf("Copy operation successful!\n");
             }
-            ctrlCopyDestroy(&listToCopy);
+            ctrlDirectoryListDestroy(&listToCopy);
         }
         ctrlUninitVM(a);
@@ -1251 +1268 @@
     RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0);
 
-    Utf8Str Utf8Directory(a->argv[1]);
     Utf8Str Utf8UserName;
     Utf8Str Utf8Password;
@@ -1258 +1274 @@
     bool fVerbose = false;
 
+    RTLISTNODE listDirs;
+    uint32_t uNumDirs = 0;
+    RTListInit(&listDirs);
+
     int vrc = VINF_SUCCESS;
     bool fUsageOK = true;
@@ -1292 +1312 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                Utf8Directory = ValueUnion.psz;
+                vrc = ctrlDirectoryEntryAppend(NULL,              /* No source given */
+                                               ValueUnion.psz,    /* Destination */
+                                               &listDirs);
+                if (RT_SUCCESS(vrc))
+                {
+                    uNumDirs++;
+                    if (uNumDirs == UINT32_MAX)
+                    {
+                        RTMsgError("Too many directories specified! Aborting.\n");
+                        vrc = VERR_TOO_MUCH_DATA;
+                    }
+                }
                 break;
             }
@@ -1304 +1335 @@
         return errorSyntax(USAGE_GUESTCONTROL, "Incorrect parameters");
 
-    if (Utf8Directory.isEmpty())
+    if (!uNumDirs)
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No directory to create specified!");
@@ -1317 +1348 @@
     if (RT_SUCCESS(vrc))
     {
-        ComPtr<IProgress> progress;
-        rc = guest->CreateDirectory(Bstr(Utf8Directory).raw(),
-                                    Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
-                                    uMode, uFlags, progress.asOutParam());
-        if (FAILED(rc))
-            vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
-        else
-        {
-            /* Setup signal handling if cancelable. */
-            ASSERT(progress);
-            bool fCanceledAlready = false;
-            BOOL fCancelable;
-            rc = progress->COMGETTER(Cancelable)(&fCancelable);
+        if (fVerbose && uNumDirs > 1)
+            RTPrintf("Creating %ld directories ...\n", uNumDirs);
+
+        PDIRECTORYENTRY pNode;
+        RTListForEach(&listDirs, pNode, DIRECTORYENTRY, Node)
+        {
+            if (fVerbose)
+                RTPrintf("Creating directory \"%s\" ...\n", pNode->pszDestPath);
+
+            ComPtr<IProgress> progress;
+            rc = guest->CreateDirectory(Bstr(pNode->pszDestPath).raw(),
+                                        Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                        uMode, uFlags, progress.asOutParam());
             if (FAILED(rc))
-                fCancelable = FALSE;
-            if (fCancelable)
-                ctrlSignalHandlerInstall();
-
-            /* Wait for process to exit ... */
-            BOOL fCompleted = FALSE;
-            BOOL fCanceled = FALSE;
-            while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
-                   && !fCompleted)
-            {
-                /* Process async cancelation */
-                if (g_fGuestCtrlCanceled && !fCanceledAlready)
-                {
-                    rc = progress->Cancel();
-                    if (SUCCEEDED(rc))
-                        fCanceledAlready = TRUE;
-                    else
-                        g_fGuestCtrlCanceled = false;
-                }
-
-                /* Progress canceled by Main API? */
-                if (   SUCCEEDED(progress->COMGETTER(Canceled(&fCanceled)))
-                    && fCanceled)
-                {
-                    break;
-                }
-            }
-
-            /* Undo signal handling. */
-            if (fCancelable)
-                ctrlSignalHandlerUninstall();
-
-            if (fCanceled)
-            {
-                //RTPrintf("Copy operation canceled!\n");
-            }
-            else if (   fCompleted
-                     && SUCCEEDED(rc))
-            {
-                LONG iRc = false;
+                vrc = ctrlPrintError(com::ErrorInfo(guest, COM_IIDOF(IGuest)));
+            else
+            {
+                LONG iRc;
                 CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
                 if (FAILED(iRc))
-                    vrc = ctrlPrintError(progress, COM_IIDOF(IProgress));
+                {
+                      vrc = ctrlPrintProgressError(progress);
+                      break;
+                }
+                else if (fVerbose)
+                    RTPrintf("Directory created: %s\n", pNode->pszDestPath);
             }
         }
         ctrlUninitVM(a);
     }
+    ctrlDirectoryListDestroy(&listDirs);
 
     if (RT_FAILURE(vrc))
@@ -1472 +1473 @@
                                                     progress.asOutParam()));
             if (FAILED(rc))
-                vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
+                vrc = ctrlPrintError(com::ErrorInfo(guest, COM_IIDOF(IGuest)));
             else
             {
                 rc = showProgress(progress);
                 if (FAILED(rc))
-                    vrc = ctrlPrintError(progress, COM_IIDOF(IProgress));
+                    vrc = ctrlPrintProgressError(progress);
                 else if (fVerbose)
                     RTPrintf("Guest Additions installer successfully copied and started.\n");