Changeset 71815 in vbox

Timestamp:

Apr 11, 2018 9:29:45 AM (6 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxManage: Removed to --dryrun parameters from the "copyto" and "copyfrom" commands.

Location:

trunk

Files:

• doc/manual/en_US/user_VBoxManage.xml (modified) (5 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (8 diffs)

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -7 +7 @@
       built into VBoxManage as well as manpages (hacking in progress).
 
-    Copyright (C) 2006-2017 Oracle Corporation
+    Copyright (C) 2006-2018 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -4700 +4700 @@
 
           <screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; copyfrom [common-options]
-           [--dryrun] [--follow] [--R|recursive]
+           [--follow] [--R|recursive]
             --target-directory &lt;host-dst-dir&gt;
             &lt;guest-src0&gt; [&lt;guest-src1&gt; [...]] </screen>
@@ -4709 +4709 @@
                 <glossdef>
                   <para>Specifies the VM UUID or VM name. Mandatory.</para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry>
-                <glossterm><computeroutput>--dryrun</computeroutput></glossterm>
-                <glossdef>
-                  <para>Instructs VBoxManage to perform a dry run instead of an actual file copying
-                  operation. Optional. </para>
                 </glossdef>
               </glossentry>
@@ -4762 +4754 @@
 
           <screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; copyto [common-options]
-           [--dryrun] [--follow] [--R|recursive]
+           [--follow] [--R|recursive]
             --target-directory &lt;guest-dst&gt;
             &lt;host-src0&gt; [&lt;host-src1&gt; [...]] </screen>
@@ -4771 +4763 @@
                 <glossdef>
                   <para>Specifies the VM UUID or VM name. Mandatory.</para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry>
-                <glossterm><computeroutput>--dryrun</computeroutput></glossterm>
-                <glossdef>
-                  <para>Instructs VBoxManage to perform a dry run instead of an actual file copying
-                  operation. Optional. </para>
                 </glossdef>
               </glossentry>

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

@@ -186 +186 @@
 
 } GCTLCMDCTX, *PGCTLCMDCTX;
-
-
-typedef struct COPYCONTEXT
-{
-    COPYCONTEXT()
-        : fDryRun(false),
-          fHostToGuest(false)
-    {
-    }
-
-    PGCTLCMDCTX pCmdCtx;
-    bool fDryRun;
-    bool fHostToGuest;
-
-} COPYCONTEXT, *PCOPYCONTEXT;
 
 /**
@@ -340 +325 @@
         RTStrmPrintf(pStrm,
                      "                              copyfrom [common-options]\n"
-                     "                              [--dryrun] [--follow] [-R|--recursive]\n"
+                     "                              [--follow] [-R|--recursive]\n"
                      "                              <guest-src0> [guest-src1 [...]] <host-dst>\n"
                      "\n"
                      "                              copyfrom [common-options]\n"
-                     "                              [--dryrun] [--follow] [-R|--recursive]\n"
+                     "                              [--follow] [-R|--recursive]\n"
                      "                              [--target-directory <host-dst-dir>]\n"
                      "                              <guest-src0> [guest-src1 [...]]\n"
@@ -351 +336 @@
         RTStrmPrintf(pStrm,
                      "                              copyto [common-options]\n"
-                     "                              [--dryrun] [--follow] [-R|--recursive]\n"
+                     "                              [--follow] [-R|--recursive]\n"
                      "                              <host-src0> [host-src1 [...]] <guest-dst>\n"
                      "\n"
                      "                              copyto [common-options]\n"
-                     "                              [--dryrun] [--follow] [-R|--recursive]\n"
+                     "                              [--follow] [-R|--recursive]\n"
                      "                              [--target-directory <guest-dst>]\n"
                      "                              <host-src0> [host-src1 [...]]\n"
@@ -1749 +1734 @@
     enum GETOPTDEF_COPY
     {
-        GETOPTDEF_COPY_DRYRUN = 1000,
-        GETOPTDEF_COPY_FOLLOW,
+        GETOPTDEF_COPY_FOLLOW = 1000,
         GETOPTDEF_COPY_TARGETDIR
     };
@@ -1756 +1740 @@
     {
         GCTLCMD_COMMON_OPTION_DEFS()
-        { "--dryrun",              GETOPTDEF_COPY_DRYRUN,           RTGETOPT_REQ_NOTHING },
         { "--follow",              GETOPTDEF_COPY_FOLLOW,           RTGETOPT_REQ_NOTHING },
         { "--recursive",           'R',                             RTGETOPT_REQ_NOTHING },
@@ -1768 +1751 @@
 
     const char *pszDst = NULL;
-    bool fDryRun = false;
     bool fFollow = false;
     bool fRecursive = false;
@@ -1782 +1764 @@
         {
             GCTLCMD_COMMON_OPTION_CASES(pCtx, ch, &ValueUnion);
-
-            case GETOPTDEF_COPY_DRYRUN:
-                fDryRun = true;
-                break;
 
             case GETOPTDEF_COPY_FOLLOW:
@@ -1843 +1821 @@
         else
             RTPrintf("Copying from guest to host ...\n");
-        if (fDryRun)
-            RTPrintf("Dry run - no files copied!\n");
     }