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

Timestamp:

Apr 21, 2010 11:18:32 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (first stuff for piping output).

File:

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

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

@@ -63 +63 @@
 {
     RTPrintf("VBoxManage guestcontrol     execute <vmname>|<uuid>\n"
-             "                            <path to program> [--arguments \"<arguments>\"] [--environment \"NAME=VALUE NAME=VALUE\"]\n"
+             "                            <path to program> [--arguments \"<arguments>\"] [--environment \"<NAME=VALUE NAME=VALUE>\"]\n"
              "                            [--flags <flags>] [--timeout <msec>] [--username <name> [--password <password>]]\n"
              "                            [--verbose] [--wait-for exit]\n"
@@ -187 +187 @@
                     waitForExit = true;
                 else if (!strcmp(a->argv[i + 1], "stdout"))
+                {
+                    waitForExit = true;
                     waitForStdOut = true;
+                }
                 else if (!strcmp(a->argv[i + 1], "stderr"))
+                {
+                    waitForExit = true;
                     waitForStdErr = true;
+                }
                 else
                     usageOK = false;
@@ -324 +330 @@
                             SafeArray<BYTE> aOutputData;
                             ULONG cbOutputData;
-                            CHECK_ERROR_BREAK(guest, GetProcessOutput(uPID, 0 /* aFlags */, _512K, ComSafeArrayAsOutParam(aOutputData)));
+                            CHECK_ERROR_BREAK(guest, GetProcessOutput(uPID, 0 /* aFlags */, 
+                                                                      uTimeoutMS, _64K, ComSafeArrayAsOutParam(aOutputData)));
                             cbOutputData = aOutputData.size();
                             if (cbOutputData == 0)