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

Timestamp:

Oct 21, 2010 11:41:49 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66869

Message:

Guest Copy/VBoxManage+Main: Implemented first working "copyto" command (single file only, no progress), in development.

File:

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

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

@@ -80 +80 @@
                  "                            copyto <vmname>|<uuid>\n"
                  "                            <source on host> <destination on guest>\n"
+                 "                            --username <name> --password <password>\n"
                  "                            [--recursive] [--verbose] [--flags <flags>]\n"
 #endif
@@ -368 +369 @@
                     RTPrintf("Waiting for process to exit ...\n");
 
-                /* setup signal handling if cancelable */
+                /* Setup signal handling if cancelable. */
                 ASSERT(progress);
                 bool fCanceledAlready = false;
@@ -441 +442 @@
                     }
 
-#if 0
+#if 1
                     static int sent = 0;
                     if (sent < 1)
@@ -627 +628 @@
     Utf8Str Utf8Source(a->argv[1]);
     Utf8Str Utf8Dest(a->argv[2]);
-    uint32_t uFlags = 0;
+    Utf8Str Utf8UserName;
+    Utf8Str Utf8Password;
+    uint32_t uFlags = CopyFileFlag_None;
     bool fVerbose = false;
     bool fCopyRecursive = false;
@@ -635 +638 @@
     for (int i = 3; usageOK && i < a->argc; i++)
     {
-        if (!strcmp(a->argv[i], "--flags"))
+        if (   !strcmp(a->argv[i], "--username")
+            || !strcmp(a->argv[i], "--user"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                Utf8UserName = a->argv[i + 1];
+                ++i;
+            }
+        }
+        else if (   !strcmp(a->argv[i], "--password")
+                 || !strcmp(a->argv[i], "--pwd"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                Utf8Password = a->argv[i + 1];
+                ++i;
+            }
+        }
+        else if (!strcmp(a->argv[i], "--flags"))
         {
             if (i + 1 >= a->argc)
@@ -678 +703 @@
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No destination specified!");
+
+    if (Utf8UserName.isEmpty())
+        return errorSyntax(USAGE_GUESTCONTROL,
+                           "No user name specified!");
 
     /* lookup VM. */
@@ -716 +745 @@
             /* Do the copy. */
             rc = guest->CopyToGuest(Bstr(Utf8Source).raw(), Bstr(Utf8Dest).raw(),
+                                    Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
                                     uFlags, progress.asOutParam());
             if (FAILED(rc))
@@ -733 +763 @@
             else
             {
-                /* setup signal handling if cancelable */
+                /* Setup signal handling if cancelable. */
                 ASSERT(progress);
                 bool fCanceledAlready = false;
@@ -751 +781 @@
                 BOOL fCompleted = FALSE;
                 BOOL fCanceled = FALSE;
-                while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
+                while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
+                       && !fCompleted)
                 {
                     /* Process async cancelation */