Changeset 33412 in vbox for trunk

Timestamp:

Oct 25, 2010 11:34:00 AM (14 years ago)

Author:

vboxsync

Message:

Removed unused code.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -1851 +1851 @@
     try
     {
-        /*ULONG cObjectsToCopy = 0;
-        RTLISTNODE listEntries;*/
-
         Utf8Str Utf8Source(aSource);
         Utf8Str Utf8Dest(aDest);
@@ -1958 +1955 @@
                 RTFileClose(fileSource);
             }
-#if 0
-            /*
-             * Does the source directory exist?
-             */
-            if (RTDirExists(pszSourceAbs))
-            {
-                /* If no trailing slash is present, append. */
-                size_t cch = strlen(pszSourceAbs);
-                if (    cch > 1
-                    &&  !RTPATH_IS_SLASH(pszSourceAbs[cch - 1])
-                    &&  !RTPATH_IS_SLASH(pszSourceAbs[cch - 2]))
-                {
-                    int vrc = RTStrAAppend(&pszSourceAbs, RTPATH_SLASH_STR);
-                    if (RT_FAILURE(vrc))
-                        rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("Failed to extend source path, rc=%Rrc\n"), vrc);
-                }
-            }
-
-            if (SUCCEEDED(rc))
-            {
-#endif
-#if 0
-                /*
-                 * Create progress object.  Note that this is a multi operation
-                 * object to perform an operation per file object we just gathered
-                 * in our list above.
-                 *
-                 * Stages:
-                 * - 0: Starting copy process
-                 * - 1: Copying file
-                 * - 2: Finished
-                 */
-                ComObjPtr <Progress> progress;
-                rc = progress.createObject();
-                if (SUCCEEDED(rc))
-                {
-                    rc = progress->init(static_cast<IGuest*>(this),
-                                        Bstr(tr("Copying to guest")).raw(),
-                                        TRUE,
-                                        3,                                  /* Number of stages. */
-                                        Bstr(tr("Starting ...")).raw());    /* Description of first stage. */
-                }
-                if (FAILED(rc)) return rc;
-
-                rc = guest->ExecuteProcess(Bstr(Utf8Cmd).raw(), uFlags,
-                                           ComSafeArrayAsInParam(args),
-                                           ComSafeArrayAsInParam(env),
-                                           Bstr(Utf8UserName).raw(),
-                                           Bstr(Utf8Password).raw(), u32TimeoutMS,
-                                           &uPID, progress.asOutParam());
-                if (SUCCEEDED(rc))
-                {
-
-                }
-#endif
-#if 0
-            }
-
-            if (SUCCEEDED(rc))
-            {
-                LogRel(("Copying \"%s\" to guest into \"%s\" ...\n",
-                    pszSourceAbs, Utf8Dest.c_str()));
-
-                /*
-                 * Count objects to copy and build file list.
-                 */
-                RTListInit(&listEntries);
-                int vrc = directoryRead(pszSourceAbs, NULL /* Filter */,
-                                        aFlags, &cObjectsToCopy, &listEntries);
-                if (RT_FAILURE(vrc))
-                {
-                    if (vrc != VERR_FILE_NOT_FOUND) /* If no files found, this is no error! */
-                        rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("Error reading source directory \"%s\", rc=%Rrc"),
-                                      pszSourceAbs, vrc);
-                }
-            }
-            RTStrFree(pszSourceAbs);
-        }
-
-        if (SUCCEEDED(rc))
-        {
-            if (cObjectsToCopy) /* Do we have some objects to copy? */
-            {
-                /*
-                 * Create progress object.  Note that this is a multi operation
-                 * object to perform an operation per file object we just gathered
-                 * in our list above.
-                 */
-                ComObjPtr <Progress> progress;
-                rc = progress.createObject();
-                if (SUCCEEDED(rc))
-                {
-                    rc = progress->init(static_cast<IGuest*>(this),
-                                        Bstr(tr("Copying to guest")).raw(),
-                                        TRUE,
-                                        cObjectsToCopy,                      /* Number of operations. */
-                                        Bstr(tr("Copying ...")).raw());      /* Description of first stage. */
-                }
-                if (FAILED(rc)) return rc;
-#endif
-#if 0
-                /*
-                 * Now copy all files in the list ...
-                 */
-                for (ULONG l=0; l < cObjectsToCopy; l++)
-                {
-                    rc = guest->ExecuteProcess(Bstr(Utf8Cmd).raw(), uFlags,
-                                       ComSafeArrayAsInParam(args),
-                                       ComSafeArrayAsInParam(env),
-                                       Bstr(Utf8UserName).raw(),
-                                       Bstr(Utf8Password).raw(), u32TimeoutMS,
-                                       &uPID, progress.asOutParam());
-                }
-#endif
-#if 0
-                if (SUCCEEDED(rc))
-                {
-                    PCALLBACKDATAEXECSTATUS pData = (PCALLBACKDATAEXECSTATUS)RTMemAlloc(sizeof(CALLBACKDATAEXECSTATUS));
-                    AssertReturn(pData, VBOX_E_IPRT_ERROR);
-                    RT_ZERO(*pData);
-                    uContextID = addCtrlCallbackContext(VBOXGUESTCTRLCALLBACKTYPE_EXEC_START,
-                                                        pData, sizeof(CALLBACKDATAEXECSTATUS), progress);
-                    Assert(uContextID > 0);
-
-                    VBOXHGCMSVCPARM paParms[15];
-                    int i = 0;
-                    paParms[i++].setUInt32(uContextID);
-                    paParms[i++].setPointer((void*)Utf8Command.c_str(), (uint32_t)Utf8Command.length() + 1);
-                    paParms[i++].setUInt32(aFlags);
-                    paParms[i++].setUInt32(uNumArgs);
-                    paParms[i++].setPointer((void*)pszArgs, cbArgs);
-                    paParms[i++].setUInt32(uNumEnv);
-                    paParms[i++].setUInt32(cbEnv);
-                    paParms[i++].setPointer((void*)pvEnv, cbEnv);
-                    paParms[i++].setPointer((void*)Utf8UserName.c_str(), (uint32_t)Utf8UserName.length() + 1);
-                    paParms[i++].setPointer((void*)Utf8Password.c_str(), (uint32_t)Utf8Password.length() + 1);
-                    paParms[i++].setUInt32(aTimeoutMS);
-
-                    VMMDev *vmmDev;
-                    {
-                        /* Make sure mParent is valid, so set the read lock while using.
-                         * Do not keep this lock while doing the actual call, because in the meanwhile
-                         * another thread could request a write lock which would be a bad idea ... */
-                        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-                        /* Forward the information to the VMM device. */
-                        AssertPtr(mParent);
-                        vmmDev = mParent->getVMMDev();
-                    }
-
-                    if (vmmDev)
-                    {
-                        LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
-                        vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_CMD,
-                                                   i, paParms);
-                    }
-                    else
-                        vrc = VERR_INVALID_VM_HANDLE;
-                }
-#endif
-#if 0
-                /* Destroy file list. */
-                VBoxGuestDirEntry *pNode = RTListNodeGetFirst(&listEntries, VBoxGuestDirEntry, Node);
-                while (pNode)
-                {
-                    VBoxGuestDirEntry *pNext = RTListNodeGetNext(&pNode->Node, VBoxGuestDirEntry, Node);
-                    bool fLast = RTListNodeIsLast(&listEntries, &pNode->Node);
-
-                    if (pNode->pszPath)
-                        RTStrFree(pNode->pszPath);
-                    RTListNodeRemove(&pNode->Node);
-                    RTMemFree(pNode);
-
-                    if (fLast)
-                        break;
-
-                    pNode = pNext;
-                }
-            }
-#endif
         }
     }