Changeset 34465 in vbox for trunk/src

Timestamp:

Nov 29, 2010 2:19:39 PM (14 years ago)

Author:

vboxsync

Message:

Guest Copy: Create directories on guest if not present.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)

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

@@ -1179 +1179 @@
                 RTListForEach(&listToCopy, pNode, DIRECTORYENTRY, Node)
                 {
+                    char *pszDestPath = RTStrDup(pNode->pszDestPath);
+                    AssertPtrBreak(pszDestPath);
+                    RTPathStripFilename(pszDestPath);
+
                     if (fVerbose)
-#ifndef DEBUG
-                        RTPrintf("Copying \"%s\" (%u/%u) ...\n",
-                                 pNode->pszSourcePath, uCurObject, cObjects);
-#else
-                        RTPrintf("Copying \"%s\" to \"%s\" (%u/%u) ...\n",
-                                 pNode->pszSourcePath, pNode->pszDestPath, uCurObject, cObjects);
-#endif
-                    /* Finally copy the desired file (if no dry run selected). */
+                        RTPrintf("Preparing guest directory \"%s\" ...\n", pszDestPath);
+
+                    ComPtr<IProgress> progressDir;
                     if (!fDryRun)
-                        vrc = ctrlCopyFileToGuest(guest, pNode->pszSourcePath, pNode->pszDestPath,
-                                                  Utf8UserName.c_str(), Utf8Password.c_str(), uFlags);
+                        rc = guest->CreateDirectory(Bstr(pszDestPath).raw(),
+                                                    Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                                    0 /* Creation mode */, CreateDirectoryFlag_Parents,
+                                                    progressDir.asOutParam());
+                    RTStrFree(pszDestPath);
+                    if (FAILED(rc))
+                        vrc = ctrlPrintError(guest, COM_IIDOF(IGuest));
+                    else
+                    {
+                        if (fVerbose)
+                    #ifndef DEBUG
+                            RTPrintf("Copying \"%s\" (%u/%u) ...\n",
+                                     pNode->pszSourcePath, uCurObject, cObjects);
+                    #else
+                            RTPrintf("Copying \"%s\" to \"%s\" (%u/%u) ...\n",
+                                     pNode->pszSourcePath, pNode->pszDestPath, uCurObject, cObjects);
+                    #endif
+                        /* Finally copy the desired file (if no dry run selected). */
+                        if (!fDryRun)
+                            vrc = ctrlCopyFileToGuest(guest, pNode->pszSourcePath, pNode->pszDestPath,
+                                                      Utf8UserName.c_str(), Utf8Password.c_str(), uFlags);
+                    }
                     if (RT_FAILURE(vrc))
                         break;