Changeset 102944 in vbox for trunk/src

Timestamp:

Jan 18, 2024 8:52:18 AM (15 months ago)

Author:

vboxsync

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

161172

Message:

VBoxManage/Guest Control: Don't re-assign fWaitForStdOut / fWaitForStdErr with the result from gctlRunSetupHandle(), as the function will return a boolean success status. This will overwrite the original flag value and thus adding unwanted flags to the API [better fix].

File:

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

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

@@ -1352 +1352 @@
         {
             aWaitFlags.push_back(ProcessWaitForFlag_Terminate);
-            if (   fWaitForStdOut
-                && gctlRunSetupHandle(fWaitForStdOut, RTHANDLESTD_OUTPUT, "stdout", enmStdOutTransform, &hVfsStdOut))
+            if (gctlRunSetupHandle(fWaitForStdOut, RTHANDLESTD_OUTPUT, "stdout", enmStdOutTransform, &hVfsStdOut))
             {
-                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdOut);
-                aWaitFlags.push_back(ProcessWaitForFlag_StdOut);
+                if (fWaitForStdOut)
+                {
+                    aCreateFlags.push_back(ProcessCreateFlag_WaitForStdOut);
+                    aWaitFlags.push_back(ProcessWaitForFlag_StdOut);
+                }
             }
-            if (   fWaitForStdErr
-                && gctlRunSetupHandle(fWaitForStdErr, RTHANDLESTD_ERROR, "stderr", enmStdErrTransform, &hVfsStdErr))
+            else /* Failed to set up handle, disable. */
+                fWaitForStdOut = false;
+
+            if (gctlRunSetupHandle(fWaitForStdErr, RTHANDLESTD_ERROR, "stderr", enmStdErrTransform, &hVfsStdErr))
             {
-                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdErr);
-                aWaitFlags.push_back(ProcessWaitForFlag_StdErr);
+                if (fWaitForStdErr)
+                {
+                    aCreateFlags.push_back(ProcessCreateFlag_WaitForStdErr);
+                    aWaitFlags.push_back(ProcessWaitForFlag_StdErr);
+                }
             }
+            else /* Failed to set up handle, disable. */
+                fWaitForStdErr = false;
         }
     }