Changeset 71251 in vbox for trunk

Timestamp:

Mar 7, 2018 11:20:00 AM (7 years ago)

Author:

vboxsync

Message:

Guest Control/[Directory|File]CopyFrom: Factored out the fileCopyFrom session task routines to also implement copying entire directories from the guest within Main. Work in progress.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/include/GuestSessionImpl.h (modified) (5 diffs)
• Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)
• Main/src-client/GuestSessionImplTasks.cpp (modified) (12 diffs)

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

@@ -219 +219 @@
         }
 
-        const char* GetSource() const
-        {
-            return mSource.c_str();
-        }
-
-        const char* GetFilter() const
-        {
-            return mFilter.c_str();
+        Utf8Str GetSource() const
+        {
+            return mSource;
+        }
+
+        Utf8Str GetFilter() const
+        {
+            return mFilter;
         }
 
@@ -1767 +1767 @@
     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str strSource;
     const char *pszDst = NULL;
     bool fDryRun = false;
@@ -1853 +1852 @@
     for (unsigned long s = 0; s < vecSources.size(); s++)
     {
-        char *pszSrc = RTStrDup(vecSources[s].GetSource());
-        AssertPtrBreakStmt(pszSrc, vrc = VERR_NO_MEMORY);
-        const char *pszFilter = vecSources[s].GetFilter();
-        RT_NOREF(pszFilter);
-        /* pszFilter can be NULL if not set. */
+        Utf8Str strSrc    = vecSources[s].GetSource();
+        Utf8Str strFilter = vecSources[s].GetFilter();
+        RT_NOREF(strFilter);
+        /* strFilter can be NULL if not set. */
 
         if (fHostToGuest)
         {
-            if (RTFileExists(pszSrc))
+            if (RTFileExists(strSrc.c_str()))
             {
                 SafeArray<FileCopyFlag_T> copyFlags;
-                rc = pCtx->pGuestSession->FileCopyToGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
+                rc = pCtx->pGuestSession->FileCopyToGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
                                                           ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
-            else if (RTDirExists(pszSrc))
+            else if (RTDirExists(strSrc.c_str()))
             {
                 SafeArray<DirectoryCopyFlag_T> copyFlags;
                 copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
-                rc = pCtx->pGuestSession->DirectoryCopyToGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
+                rc = pCtx->pGuestSession->DirectoryCopyToGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
                                                                ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
             else if (pCtx->cVerbose)
-                RTPrintf("Warning: \"%s\" does not exist or is not a file/directory, skipping ...\n", pszSrc);
+                RTPrintf("Warning: \"%s\" does not exist or is not a file/directory, skipping ...\n", strSrc.c_str());
         }
         else
         {
-            SafeArray<FileCopyFlag_T> copyFlags;
-            rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
-                                                        ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            if (   strSrc.endsWith("/")
+                || strSrc.endsWith("\\"))
+            {
+                SafeArray<DirectoryCopyFlag_T> copyFlags;
+                copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
+                rc = pCtx->pGuestSession->DirectoryCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                                                                 ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            }
+            else
+            {
+                SafeArray<FileCopyFlag_T> copyFlags;
+                rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                                                            ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            }
         }
     }

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -82 +82 @@
     /** @name File handling primitives.
      * @{ */
-    int fileCopyToGuestEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags, PRTFILE pFile,
-                          uint64_t cbOffset, uint64_t cbSize); /**< r=bird: 'cbOffset' makes no sense what so ever. It should be 'off', or do you mean sizeof(uint64_t)? */
-    int fileCopyToGuest(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
+    int fileCopyFromEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags,
+                       PRTFILE pFile, uint64_t cbOffset, uint64_t cbSize);
+    int fileCopyFrom(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
+    int fileCopyToEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags, PRTFILE pFile,
+                     uint64_t cbOffset, uint64_t cbSize); /**< r=bird: 'cbOffset' makes no sense what so ever. It should be 'off', or do you mean sizeof(uint64_t)? */
+    int fileCopyTo(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
     /** @}  */
 
@@ -195 +198 @@
 
     SessionTaskCopyFileTo(GuestSession *pSession,
-                          const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags);
+                          const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
     SessionTaskCopyFileTo(GuestSession *pSession,
                           PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize,
-                          const Utf8Str &strDest, uint32_t uFlags);
+                          const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
     virtual ~SessionTaskCopyFileTo(void);
     int Run(void);
@@ -204 +207 @@
 protected:
 
-    Utf8Str  mSource;
-    PRTFILE  mSourceFile;
-    size_t   mSourceOffset;
-    uint64_t mSourceSize;
-    Utf8Str  mDest;
-    uint32_t mCopyFileFlags;
+    Utf8Str        mSource;
+    PRTFILE        mSourceFile;
+    size_t         mSourceOffset;
+    uint64_t       mSourceSize;
+    Utf8Str        mDest;
+    FileCopyFlag_T mFileCopyFlags;
 };
 
@@ -220 +223 @@
 
     SessionTaskCopyFileFrom(GuestSession *pSession,
-                        const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags);
+                        const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags);
     virtual ~SessionTaskCopyFileFrom(void);
     int Run(void);
@@ -226 +229 @@
 protected:
 
-    Utf8Str  mSource;
-    Utf8Str  mDest;
-    uint32_t mFlags;
+    Utf8Str        mSource;
+    Utf8Str        mDest;
+    FileCopyFlag_T mFileCopyFlags;
 };
 

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

@@ -2600 +2600 @@
                                              const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
-    RT_NOREF(aSource, aDestination, aFlags, aProgress);
-    ReturnComNotImplemented();
+    LogFlowThisFuncEnter();
+
+    if (RT_UNLIKELY((aSource.c_str()) == NULL || *(aSource.c_str()) == '\0'))
+        return setError(E_INVALIDARG, tr("No source directory specified"));
+
+    if (RT_UNLIKELY((aDestination.c_str()) == NULL || *(aDestination.c_str()) == '\0'))
+        return setError(E_INVALIDARG, tr("No destination directory specified"));
+
+    uint32_t fFlags = DirectoryCopyFlag_None;
+    if (aFlags.size())
+    {
+        for (size_t i = 0; i < aFlags.size(); i++)
+            fFlags |= aFlags[i];
+    }
+    /** @todo Validate flags. */
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT hr = S_OK;
+
+    try
+    {
+        SessionTaskCopyDirFrom *pTask = NULL;
+        ComObjPtr<Progress> pProgress;
+        try
+        {
+            pTask = new SessionTaskCopyDirFrom(this /* GuestSession */, aSource, aDestination, "" /* strFilter */,
+                                               (DirectoryCopyFlag_T)fFlags);
+        }
+        catch(...)
+        {
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Failed to create SessionTaskCopyDirFrom object"));
+            throw;
+        }
+
+        hr = pTask->Init(Utf8StrFmt(tr("Copying directory \"%s\" from guest to \"%s\" on the host"),
+                                    aSource.c_str(), aDestination.c_str()));
+        if (FAILED(hr))
+        {
+            delete pTask;
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Creating progress object for SessionTaskCopyDirFrom object failed"));
+            throw hr;
+        }
+
+        hr = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
+
+        if (SUCCEEDED(hr))
+        {
+            /* Return progress to the caller. */
+            pProgress = pTask->GetProgressObject();
+            hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
+        }
+        else
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Starting thread for copying directory \"%s\" from guest to \"%s\" on the host failed"),
+                          aSource.c_str(), aDestination.c_str());
+    }
+    catch(std::bad_alloc &)
+    {
+        hr = E_OUTOFMEMORY;
+    }
+    catch(HRESULT eHR)
+    {
+        hr = eHR;
+        LogFlowThisFunc(("Exception was caught in the function\n"));
+    }
+
+    return hr;
 }
 

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

@@ -261 +261 @@
 
 /**
+ * Copies a file from the guest to the host, extended version.
+ *
+ * @return VBox status code.
+ * @param  strSource            Full path of source file on the guest to copy.
+ * @param  strDest              Full destination path and file name (host style) to copy file to.
+ * @param  enmFileCopyFlags     File copy flags. Currently not used.
+ * @param  pFile                Destination file handle to use for accessing the host file.
+ *                              The caller is responsible of opening / closing the file accordingly.
+ * @param  cbOffset             Offset (in bytes) where to start copying the source file.
+ *                              Currently unused, must be 0.
+ * @param  cbSize               Size (in bytes) to copy from the source file.
+ *                              Currently unused, must be 0.
+ */
+int GuestSessionTask::fileCopyFromEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags,
+                                     PRTFILE pFile, uint64_t cbOffset, uint64_t cbSize)
+{
+    RT_NOREF(enmFileCopyFlags, cbOffset, cbSize);
+
+    AssertReturn(cbOffset == 0, VERR_NOT_IMPLEMENTED);
+    AssertReturn(cbSize   == 0, VERR_NOT_IMPLEMENTED);
+
+    RTMSINTERVAL msTimeout = 30 * 1000; /** @todo 30s timeout for all actions. Make this configurable? */
+
+    /*
+     * Note: There will be races between querying file size + reading the guest file's
+     *       content because we currently *do not* lock down the guest file when doing the
+     *       actual operations.
+     ** @todo Use the IGuestFile API for locking down the file on the guest!
+     */
+    GuestFsObjData objData;
+    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int rc = mSession->i_fileQueryInfoInternal(strSource, false /*fFollowSymlinks*/, objData, &rcGuest);
+    if (RT_FAILURE(rc))
+    {
+        switch (rc)
+        {
+            case VERR_GSTCTL_GUEST_ERROR:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
+                break;
+
+            default:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"),
+                                               strSource.c_str(), rc));
+                break;
+        }
+    }
+    else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), strSource.c_str()));
+        rc = VERR_NOT_A_FILE;
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
+    GuestProcessStartupInfo procInfo;
+    procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"),
+                                strSource.c_str(), strDest.c_str(), objData.mObjectSize);
+    procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_CAT);
+    procInfo.mFlags      = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut;
+
+    /* Set arguments.*/
+    procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
+    procInfo.mArguments.push_back(strSource);            /* Which file to output? */
+
+    /* Startup process. */
+    ComObjPtr<GuestProcess> pProcess;
+    rc = mSession->i_processCreateExInternal(procInfo, pProcess);
+    if (RT_SUCCESS(rc))
+        rc = pProcess->i_startProcess(msTimeout, &rcGuest);
+
+    if (RT_FAILURE(rc))
+    {
+        switch (rc)
+        {
+            case VERR_GSTCTL_GUEST_ERROR:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
+                break;
+
+            default:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr(
+                                   "Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"),
+                                   strSource.c_str(), rc));
+                break;
+        }
+
+        return rc;
+    }
+
+    ProcessWaitResult_T waitRes;
+    BYTE byBuf[_64K];
+
+    BOOL fCanceled = FALSE;
+    uint64_t cbWrittenTotal = 0;
+    uint64_t cbToRead = objData.mObjectSize;
+
+    for (;;)
+    {
+        rc = pProcess->i_waitFor(ProcessWaitForFlag_StdOut, msTimeout, waitRes, &rcGuest);
+        if (RT_FAILURE(rc))
+        {
+            switch (rc)
+            {
+                case VERR_GSTCTL_GUEST_ERROR:
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
+                    break;
+
+                default:
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(GuestSession::tr("Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"),
+                                                   strSource.c_str(), rc));
+                    break;
+            }
+
+            break;
+        }
+
+        if (   waitRes == ProcessWaitResult_StdOut
+            || waitRes == ProcessWaitResult_WaitFlagNotSupported)
+        {
+            /* If the guest does not support waiting for stdin, we now yield in
+             * order to reduce the CPU load due to busy waiting. */
+            if (waitRes == ProcessWaitResult_WaitFlagNotSupported)
+                RTThreadYield(); /* Optional, don't check rc. */
+
+            uint32_t cbRead = 0; /* readData can return with VWRN_GSTCTL_OBJECTSTATE_CHANGED. */
+            rc = pProcess->i_readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
+                                      msTimeout, byBuf, sizeof(byBuf),
+                                      &cbRead, &rcGuest);
+            if (RT_FAILURE(rc))
+            {
+                switch (rc)
+                {
+                    case VERR_GSTCTL_GUEST_ERROR:
+                        setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
+                        break;
+
+                    default:
+                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                            Utf8StrFmt(GuestSession::tr("Reading from guest file \"%s\" (offset %RU64) failed: %Rrc"),
+                                                       strSource.c_str(), cbWrittenTotal, rc));
+                        break;
+                }
+
+                break;
+            }
+
+            if (cbRead)
+            {
+                rc = RTFileWrite(*pFile, byBuf, cbRead, NULL /* No partial writes */);
+                if (RT_FAILURE(rc))
+                {
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(GuestSession::tr("Writing to host file \"%s\" (%RU64 bytes left) failed: %Rrc"),
+                                                   strDest.c_str(), cbToRead, rc));
+                    break;
+                }
+
+                /* Only subtract bytes reported written by the guest. */
+                Assert(cbToRead >= cbRead);
+                cbToRead -= cbRead;
+
+                /* Update total bytes written to the guest. */
+                cbWrittenTotal += cbRead;
+                Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize);
+
+                /* Did the user cancel the operation above? */
+                if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
+                    && fCanceled)
+                    break;
+
+                rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0)));
+                if (RT_FAILURE(rc))
+                    break;
+            }
+        }
+        else
+           break;
+
+    } /* for */
+
+    LogFlowThisFunc(("rc=%Rrc, rcGuest=%Rrc, waitRes=%ld, cbWrittenTotal=%RU64, cbSize=%RI64, cbToRead=%RU64\n",
+                     rc, rcGuest, waitRes, cbWrittenTotal, objData.mObjectSize, cbToRead));
+
+    /*
+     * Wait on termination of guest process until it completed all operations.
+     */
+    if (   !fCanceled
+        || RT_SUCCESS(rc))
+    {
+        rc = pProcess->i_waitFor(ProcessWaitForFlag_Terminate, msTimeout, waitRes, &rcGuest);
+        if (   RT_FAILURE(rc)
+            || waitRes != ProcessWaitResult_Terminate)
+        {
+            if (RT_FAILURE(rc))
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(
+                                    GuestSession::tr("Waiting on termination for copying file \"%s\" from guest failed: %Rrc"),
+                                    strSource.c_str(), rc));
+            else
+            {
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr(
+                                               "Waiting on termination for copying file \"%s\" from guest failed with wait result %ld"),
+                                               strSource.c_str(), waitRes));
+                rc = VERR_GENERAL_FAILURE; /* Fudge. */
+            }
+        }
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /** @todo this code sequence is duplicated in CopyTo   */
+    ProcessStatus_T procStatus = ProcessStatus_TerminatedAbnormally;
+    HRESULT hrc = pProcess->COMGETTER(Status(&procStatus));
+    if (!SUCCEEDED(hrc))
+        procStatus = ProcessStatus_TerminatedAbnormally;
+
+    LONG exitCode = 42424242;
+    hrc = pProcess->COMGETTER(ExitCode(&exitCode));
+    if (!SUCCEEDED(hrc))
+        exitCode = 42424242;
+
+    if (   procStatus != ProcessStatus_TerminatedNormally
+        || exitCode != 0)
+    {
+        LogFlowThisFunc(("procStatus=%d, exitCode=%d\n", procStatus, exitCode));
+        if (procStatus == ProcessStatus_TerminatedNormally)
+            rc = GuestProcessTool::i_exitCodeToRc(procInfo, exitCode);
+        else
+            rc = VERR_GENERAL_FAILURE;
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to host failed: %Rrc"),
+                                       strSource.c_str(), rc));
+    }
+    /*
+     * Even if we succeeded until here make sure to check whether we really transfered
+     * everything.
+     */
+    else if (   objData.mObjectSize > 0
+             && cbWrittenTotal == 0)
+    {
+        /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
+         * to the destination -> access denied. */
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Writing guest file \"%s\" to host to \"%s\" failed: Access denied"),
+                                       strSource.c_str(), strDest.c_str()));
+        rc = VERR_ACCESS_DENIED;
+    }
+    else if (cbWrittenTotal < (uint64_t)objData.mObjectSize)
+    {
+        /* If we did not copy all let the user know. */
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Copying guest file \"%s\" to host to \"%s\" failed (%RU64/%RI64 bytes transfered)"),
+                                       strSource.c_str(), strDest.c_str(), cbWrittenTotal, objData.mObjectSize));
+        rc = VERR_INTERRUPTED;
+    }
+
+    return rc;
+}
+
+/**
+ * Copies a file from the guest to the host.
+ *
+ * @return VBox status code.
+ * @param  strSource            Full path of source file on the guest to copy.
+ * @param  strDest              Full destination path and file name (host style) to copy file to.
+ * @param  enmFileCopyFlags     File copy flags.
+ */
+int GuestSessionTask::fileCopyFrom(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
+{
+    RTFILE hFile;
+    int rc = RTFileOpen(&hFile, strDest.c_str(),
+                        RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */
+    if (RT_FAILURE(rc))
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Opening/creating destination file on host \"%s\" failed: %Rrc"),
+                                       strDest.c_str(), rc));
+        return rc;
+    }
+
+    rc = fileCopyFromEx(strSource, strDest, enmFileCopyFlags, &hFile, 0 /* Offset, unused */, 0 /* Size, unused */);
+
+    int rc2 = RTFileClose(hFile);
+    AssertRC(rc2);
+
+    return rc;
+}
+
+/**
  * Copies a file from the host to the guest, extended version.
  *
@@ -272 +567 @@
  * @param  cbSize               Size (in bytes) to copy from the source file.
  */
-int GuestSessionTask::fileCopyToGuestEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags,
-                                        PRTFILE pFile, uint64_t cbOffset, uint64_t cbSize)
+int GuestSessionTask::fileCopyToEx(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags,
+                                   PRTFILE pFile, uint64_t cbOffset, uint64_t cbSize)
 {
     /** @todo Implement sparse file support? */
@@ -537 +832 @@
  * @param  enmFileCopyFlags     File copy flags.
  */
-int GuestSessionTask::fileCopyToGuest(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
+int GuestSessionTask::fileCopyTo(const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
 {
     int rc;
@@ -571 +866 @@
             }
             else
-                rc = fileCopyToGuestEx(strSource, strDest, enmFileCopyFlags, &hFile, 0 /* Offset */, cbSize);
+                rc = fileCopyToEx(strSource, strDest, enmFileCopyFlags, &hFile, 0 /* Offset */, cbSize);
 
              RTFileClose(hFile);
@@ -629 +924 @@
 }
 
+SessionTaskCopyDirFrom::SessionTaskCopyDirFrom(GuestSession *pSession, const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter,
+                                               DirectoryCopyFlag_T enmDirCopyFlags)
+                                               : GuestSessionTask(pSession)
+                                               , mSource(strSource)
+                                               , mDest(strDest)
+                                               , mFilter(strFilter)
+                                               , mDirCopyFlags(enmDirCopyFlags)
+{
+    m_strTaskName = "gctlCpyDirFrm";
+}
+
+SessionTaskCopyDirFrom::~SessionTaskCopyDirFrom(void)
+{
+
+}
+
+/**
+ * Copys a directory (tree) from guest to the host.
+ *
+ * @return  IPRT status code.
+ * @param   strSource               Source directory on the guest to copy to the host.
+ * @param   strFilter               DOS-style wildcard filter (?, *).  Optional.
+ * @param   strDest                 Destination directory on the host.
+ * @param   fRecursive,             Whether to recursively copy the directory contents or not.
+ * @param   fFollowSymlinks         Whether to follow symlinks or not.
+ * @param   strSubDir               Current sub directory to handle. Needs to NULL and only
+ *                                  is needed for recursion.
+ */
+int SessionTaskCopyDirFrom::directoryCopyToHost(const Utf8Str &strSource, const Utf8Str &strFilter,
+                                                const Utf8Str &strDest, bool fRecursive, bool fFollowSymlinks,
+                                                const Utf8Str &strSubDir /* For recursion. */)
+{
+    Utf8Str strSrcDir    = strSource;
+    Utf8Str strDstDir    = strDest;
+    Utf8Str strSrcSubDir = strSubDir;
+
+    /* Validation and sanity. */
+    if (   !strSrcDir.endsWith("/")
+        && !strSrcDir.endsWith("\\"))
+        strSrcDir += "/";
+
+    if (   !strDstDir.endsWith("/")
+        && !strDstDir.endsWith("\\"))
+        strDstDir+= "/";
+
+    if (    strSrcSubDir.isNotEmpty() /* Optional, for recursion. */
+        && !strSrcSubDir.endsWith("/")
+        && !strSrcSubDir.endsWith("\\"))
+        strSrcSubDir += "/";
+
+    Utf8Str strSrcCur = strSrcDir + strSrcSubDir;
+
+    LogFlowFunc(("Entering '%s'\n", strSrcCur.c_str()));
+
+    int rc;
+
+    if (strSrcSubDir.isNotEmpty())
+    {
+        const uint32_t fMode = 0700; /** @todo */
+
+        rc = RTDirCreate(Utf8Str(strDstDir + strSrcSubDir).c_str(), fMode, 0);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    GuestDirectoryOpenInfo dirOpenInfo;
+    dirOpenInfo.mFilter = strFilter;
+    dirOpenInfo.mPath   = strSrcCur;
+    dirOpenInfo.mFlags  = 0; /** @todo Handle flags? */
+
+    ComObjPtr <GuestDirectory> pDir; int rcGuest;
+    rc = mSession->i_directoryOpenInternal(dirOpenInfo, pDir, &rcGuest);
+    if (RT_FAILURE(rc))
+    {
+        switch (rc)
+        {
+            case VERR_INVALID_PARAMETER:
+               setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Opening directory \"%s\" failed: Invalid parameter"), dirOpenInfo.mPath.c_str()));
+               break;
+
+            case VERR_GSTCTL_GUEST_ERROR:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
+                break;
+
+            default:
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Opening directory \"%s\" failed: %Rrc"), dirOpenInfo.mPath.c_str(), rc));
+                break;
+        }
+
+        return rc;
+    }
+
+RT_NOREF(fRecursive, fFollowSymlinks);
+
+    ComObjPtr<GuestFsObjInfo> fsObjInfo;
+    while (RT_SUCCESS(rc = pDir->i_readInternal(fsObjInfo, &rcGuest)))
+    {
+        com::Bstr aName;
+        fsObjInfo->COMGETTER(Name)(aName.asOutParam());
+        LogFlowThisFunc(("strName=%ls\n", aName.raw()));
+    }
+
+    if (rc == VERR_NO_MORE_FILES) /* Reading done? */
+        rc = VINF_SUCCESS;
+
+    pDir->i_closeInternal(&rcGuest);
+
+    LogFlowFunc(("Leaving '%s', rc=%Rrc\n", strSrcCur.c_str(), rc));
+    return rc;
+}
+
+int SessionTaskCopyDirFrom::Run(void)
+{
+    LogFlowThisFuncEnter();
+
+    AutoCaller autoCaller(mSession);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    const bool fRecursive      = true; /** @todo Make this configurable. */
+    const bool fFollowSymlinks = true; /** @todo Make this configurable. */
+    const uint32_t fDirMode    = 0700; /* Play safe by default. */
+
+    int rc = VINF_SUCCESS;
+
+    /* Create the root target directory on the host.
+     * The target directory might already exist on the host (based on mDirCopyFlags). */
+    const bool fExists = RTDirExists(mDest.c_str());
+    if (   fExists
+        && !(mDirCopyFlags & DirectoryCopyFlag_CopyIntoExisting))
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Destination directory \"%s\" exists when it must not"), mDest.c_str()));
+        rc = VERR_ALREADY_EXISTS;
+    }
+    else if (!fExists)
+    {
+        rc = RTDirCreate(mDest.c_str(), fDirMode, 0);
+        if (RT_FAILURE(rc))
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                Utf8StrFmt(GuestSession::tr("Error creating destination directory \"%s\", rc=%Rrc"),
+                                           mDest.c_str(), rc));
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
+    RTDIR hDir;
+    rc = RTDirOpen(&hDir, mDest.c_str());
+    if (RT_FAILURE(rc))
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Error opening destination directory \"%s\", rc=%Rrc"),
+                                       mDest.c_str(), rc));
+        return rc;
+    }
+
+    /* At this point the directory on the host was created and (hopefully) is ready
+     * to receive further content. */
+    rc = directoryCopyToHost(mSource, mFilter, mDest, fRecursive, fFollowSymlinks,
+                             "" /* strSubDir; for recursion */);
+    if (RT_SUCCESS(rc))
+        rc = setProgressSuccess();
+
+    RTDirClose(hDir);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 SessionTaskCopyDirTo::SessionTaskCopyDirTo(GuestSession *pSession,
                                            const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter,
@@ -638 +1104 @@
                                            , mDirCopyFlags(enmDirCopyFlags)
 {
-    m_strTaskName = "gctlCopyDirTo";
+    m_strTaskName = "gctlCpyDirTo";
 }
 
@@ -761 +1227 @@
                         Utf8Str strSrcFile = strSrcDir + strSrcSubDir + Utf8Str(pDirEntry->szName);
                         Utf8Str strDstFile = strDstDir + strSrcSubDir + Utf8Str(pDirEntry->szName);
-                        rc = fileCopyToGuest(strSrcFile, strDstFile, FileCopyFlag_None);
+                        rc = fileCopyTo(strSrcFile, strDstFile, FileCopyFlag_None);
                     }
                     break;
@@ -817 +1283 @@
 
 SessionTaskCopyFileTo::SessionTaskCopyFileTo(GuestSession *pSession,
-                                             const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags)
-                                             : GuestSessionTask(pSession),
-                                               mSource(strSource),
-                                               mSourceFile(NULL),
-                                               mSourceOffset(0),
-                                               mSourceSize(0),
-                                               mDest(strDest)
-{
-    mCopyFileFlags = uFlags;
-    m_strTaskName = "gctlCopyFileTo";
+                                             const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
+                                             : GuestSessionTask(pSession)
+                                             , mSource(strSource)
+                                             , mSourceFile(NULL)
+                                             , mSourceOffset(0)
+                                             , mSourceSize(0)
+                                             , mDest(strDest)
+                                             , mFileCopyFlags(enmFileCopyFlags)
+{
+    m_strTaskName = "gctlCpyFileTo";
 }
 
 SessionTaskCopyFileTo::SessionTaskCopyFileTo(GuestSession *pSession,
                                              PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize,
-                                             const Utf8Str &strDest, uint32_t uFlags)
+                                             const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
                                              : GuestSessionTask(pSession)
-{
-    mSourceFile    = pSourceFile;
-    mSourceOffset  = cbSourceOffset;
-    mSourceSize    = cbSourceSize;
-    mDest          = strDest;
-    mCopyFileFlags = uFlags;
-    m_strTaskName = "gctlCopyFileToWithHandle";
+                                             , mSourceFile(pSourceFile)
+                                             , mSourceOffset(cbSourceOffset)
+                                             , mSourceSize(cbSourceSize)
+                                             , mDest(strDest)
+                                             , mFileCopyFlags(enmFileCopyFlags)
+{
+    m_strTaskName = "gctlCpyFileToH";
 }
 
@@ -875 +1341 @@
     }
 
-    if (mCopyFileFlags)
+    if (mFileCopyFlags)
     {
         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                             Utf8StrFmt(GuestSession::tr("Copy flags (%#x) not implemented yet"),
-                            mCopyFileFlags));
+                            mFileCopyFlags));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -931 +1397 @@
     {
         if (mSourceFile) /* Use existing file handle. */
-            rc = fileCopyToGuestEx(mSource, mDest, (FileCopyFlag_T)mCopyFileFlags, mSourceFile, mSourceOffset, mSourceSize);
+            rc = fileCopyToEx(mSource, mDest, (FileCopyFlag_T)mFileCopyFlags, mSourceFile, mSourceOffset, mSourceSize);
         else
-            rc = fileCopyToGuest(mSource, mDest, (FileCopyFlag_T)mCopyFileFlags);
+            rc = fileCopyTo(mSource, mDest, (FileCopyFlag_T)mFileCopyFlags);
 
         if (RT_SUCCESS(rc))
@@ -944 +1410 @@
 
 SessionTaskCopyFileFrom::SessionTaskCopyFileFrom(GuestSession *pSession,
-                                                 const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags)
+                                                 const Utf8Str &strSource, const Utf8Str &strDest, FileCopyFlag_T enmFileCopyFlags)
                                                  : GuestSessionTask(pSession)
-{
-    mSource = strSource;
-    mDest   = strDest;
-    mFlags  = uFlags;
-    m_strTaskName = "gctlCopyFileFrom";
+                                                 , mSource(strSource)
+                                                 , mDest(strDest)
+                                                 , mFileCopyFlags(enmFileCopyFlags)
+{
+    m_strTaskName = "gctlCpyFileFrm";
 }
 
@@ -965 +1431 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    RTMSINTERVAL msTimeout = 30 * 1000; /** @todo 30s timeout for all actions. Make this configurable? */
-
-    /*
-     * Note: There will be races between querying file size + reading the guest file's
-     *       content because we currently *do not* lock down the guest file when doing the
-     *       actual operations.
-     ** @todo Use the IGuestFile API for locking down the file on the guest!
-     */
-    GuestFsObjData objData;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int rc = mSession->i_fileQueryInfoInternal(Utf8Str(mSource), false /*fFollowSymlinks*/, objData, &rcGuest);
-    if (RT_FAILURE(rc))
-    {
-        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                            Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"),
-                                       mSource.c_str(), rc));
-    }
-    else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */
-    {
-        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                            Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str()));
-        rc = VERR_NOT_A_FILE;
-    }
-
+    int rc = fileCopyFrom(mSource, mDest, mFileCopyFlags);
     if (RT_SUCCESS(rc))
-    {
-        RTFILE fileDest;
-        rc = RTFileOpen(&fileDest, mDest.c_str(),
-                        RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */
-        if (RT_FAILURE(rc))
-        {
-            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(GuestSession::tr("Opening/creating destination file on host \"%s\" failed: %Rrc"),
-                                           mDest.c_str(), rc));
-        }
-        else
-        {
-            GuestProcessStartupInfo procInfo;
-            procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"),
-                                        mSource.c_str(), mDest.c_str(), objData.mObjectSize);
-            procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_CAT);
-            procInfo.mFlags      = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut;
-
-            /* Set arguments.*/
-            procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
-            procInfo.mArguments.push_back(mSource);              /* Which file to output? */
-
-            /* Startup process. */
-            ComObjPtr<GuestProcess> pProcess;
-            rc = mSession->i_processCreateExInternal(procInfo, pProcess);
-            if (RT_SUCCESS(rc))
-                rc = pProcess->i_startProcess(msTimeout, &rcGuest);
-            if (RT_FAILURE(rc))
-            {
-                switch (rc)
-                {
-                    case VERR_GSTCTL_GUEST_ERROR:
-                        setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
-                        break;
-
-                    default:
-                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(GuestSession::tr(
-                                           "Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"),
-                                           mSource.c_str(), rc));
-                        break;
-                }
-            }
-            else
-            {
-                ProcessWaitResult_T waitRes;
-                BYTE byBuf[_64K];
-
-                BOOL fCanceled = FALSE;
-                uint64_t cbWrittenTotal = 0;
-                uint64_t cbToRead = objData.mObjectSize;
-
-                for (;;)
-                {
-                    rc = pProcess->i_waitFor(ProcessWaitForFlag_StdOut, msTimeout, waitRes, &rcGuest);
-                    if (RT_FAILURE(rc))
-                    {
-                        switch (rc)
-                        {
-                            case VERR_GSTCTL_GUEST_ERROR:
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
-                                break;
-
-                            default:
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                    Utf8StrFmt(GuestSession::tr("Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"),
-                                                               mSource.c_str(), rc));
-                                break;
-                        }
-
-                        break;
-                    }
-
-                    if (   waitRes == ProcessWaitResult_StdOut
-                        || waitRes == ProcessWaitResult_WaitFlagNotSupported)
-                    {
-                        /* If the guest does not support waiting for stdin, we now yield in
-                         * order to reduce the CPU load due to busy waiting. */
-                        if (waitRes == ProcessWaitResult_WaitFlagNotSupported)
-                            RTThreadYield(); /* Optional, don't check rc. */
-
-                        uint32_t cbRead = 0; /* readData can return with VWRN_GSTCTL_OBJECTSTATE_CHANGED. */
-                        rc = pProcess->i_readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
-                                                  msTimeout, byBuf, sizeof(byBuf),
-                                                  &cbRead, &rcGuest);
-                        if (RT_FAILURE(rc))
-                        {
-                            switch (rc)
-                            {
-                                case VERR_GSTCTL_GUEST_ERROR:
-                                    setProgressErrorMsg(VBOX_E_IPRT_ERROR, GuestProcess::i_guestErrorToString(rcGuest));
-                                    break;
-
-                                default:
-                                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                        Utf8StrFmt(GuestSession::tr("Reading from guest file \"%s\" (offset %RU64) failed: %Rrc"),
-                                                                   mSource.c_str(), cbWrittenTotal, rc));
-                                    break;
-                            }
-
-                            break;
-                        }
-
-                        if (cbRead)
-                        {
-                            rc = RTFileWrite(fileDest, byBuf, cbRead, NULL /* No partial writes */);
-                            if (RT_FAILURE(rc))
-                            {
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                    Utf8StrFmt(GuestSession::tr("Writing to host file \"%s\" (%RU64 bytes left) failed: %Rrc"),
-                                                                mDest.c_str(), cbToRead, rc));
-                                break;
-                            }
-
-                            /* Only subtract bytes reported written by the guest. */
-                            Assert(cbToRead >= cbRead);
-                            cbToRead -= cbRead;
-
-                            /* Update total bytes written to the guest. */
-                            cbWrittenTotal += cbRead;
-                            Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize);
-
-                            /* Did the user cancel the operation above? */
-                            if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
-                                && fCanceled)
-                                break;
-
-                            rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0)));
-                            if (RT_FAILURE(rc))
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        break;
-                    }
-
-                } /* for */
-
-                LogFlowThisFunc(("rc=%Rrc, rcGuest=%Rrc, waitRes=%ld, cbWrittenTotal=%RU64, cbSize=%RI64, cbToRead=%RU64\n",
-                                 rc, rcGuest, waitRes, cbWrittenTotal, objData.mObjectSize, cbToRead));
-
-                /*
-                 * Wait on termination of guest process until it completed all operations.
-                 */
-                if (   !fCanceled
-                    || RT_SUCCESS(rc))
-                {
-                    rc = pProcess->i_waitFor(ProcessWaitForFlag_Terminate, msTimeout, waitRes, &rcGuest);
-                    if (   RT_FAILURE(rc)
-                        || waitRes != ProcessWaitResult_Terminate)
-                    {
-                        if (RT_FAILURE(rc))
-                            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(
-                                                GuestSession::tr("Waiting on termination for copying file \"%s\" from guest failed: %Rrc"),
-                                                mSource.c_str(), rc));
-                        else
-                        {
-                            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(GuestSession::tr(
-                                                           "Waiting on termination for copying file \"%s\" from guest failed with wait result %ld"),
-                                                           mSource.c_str(), waitRes));
-                            rc = VERR_GENERAL_FAILURE; /* Fudge. */
-                        }
-                    }
-                }
-
-                if (RT_SUCCESS(rc))
-                {
-                    /** @todo this code sequence is duplicated in CopyTo   */
-                    ProcessStatus_T procStatus = ProcessStatus_TerminatedAbnormally;
-                    HRESULT hrc = pProcess->COMGETTER(Status(&procStatus));
-                    if (!SUCCEEDED(hrc))
-                        procStatus = ProcessStatus_TerminatedAbnormally;
-
-                    LONG exitCode = 42424242;
-                    hrc = pProcess->COMGETTER(ExitCode(&exitCode));
-                    if (!SUCCEEDED(hrc))
-                        exitCode = 42424242;
-
-                    if (   procStatus != ProcessStatus_TerminatedNormally
-                        || exitCode != 0)
-                    {
-                        LogFlowThisFunc(("procStatus=%d, exitCode=%d\n", procStatus, exitCode));
-                        if (procStatus == ProcessStatus_TerminatedNormally)
-                            rc = GuestProcessTool::i_exitCodeToRc(procInfo, exitCode);
-                        else
-                            rc = VERR_GENERAL_FAILURE;
-                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to host failed: %Rrc"),
-                                                       mSource.c_str(), rc));
-                    }
-                    /*
-                     * Even if we succeeded until here make sure to check whether we really transfered
-                     * everything.
-                     */
-                    else if (   objData.mObjectSize > 0
-                             && cbWrittenTotal == 0)
-                    {
-                        /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
-                         * to the destination -> access denied. */
-                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(GuestSession::tr("Writing guest file \"%s\" to host to \"%s\" failed: Access denied"),
-                                                       mSource.c_str(), mDest.c_str()));
-                        rc = VERR_ACCESS_DENIED;
-                    }
-                    else if (cbWrittenTotal < (uint64_t)objData.mObjectSize)
-                    {
-                        /* If we did not copy all let the user know. */
-                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(GuestSession::tr("Copying guest file \"%s\" to host to \"%s\" failed (%RU64/%RI64 bytes transfered)"),
-                                                       mSource.c_str(), mDest.c_str(), cbWrittenTotal, objData.mObjectSize));
-                        rc = VERR_INTERRUPTED;
-                    }
-                    else
-                        rc = setProgressSuccess();
-                }
-            }
-
-            RTFileClose(fileDest);
-        }
-    }
+        rc = setProgressSuccess();
 
     LogFlowFuncLeaveRC(rc);