Changeset 39418 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 25, 2011 10:11:06 AM (13 years ago)

Author:

vboxsync

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

75045

Message:

GuestCtrl: Added support for explicitly waiting on stdout/stderr, bugfixes, logging adjustments.

File:

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

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

@@ -570 +570 @@
 
             case GETOPTDEF_EXEC_WAITFORSTDOUT:
-                fWaitForExit = true;
-                fWaitForStdOut = true;
+                fExecFlags |= ExecuteProcessFlag_WaitForStdOut;
+                fWaitForExit = fWaitForStdOut = true;
                 break;
 
             case GETOPTDEF_EXEC_WAITFORSTDERR:
+                fExecFlags |= ExecuteProcessFlag_WaitForStdErr;
                 fWaitForExit = (fOutputFlags |= ProcessOutputFlag_StdErr) ? true : false;
                 break;
@@ -662 +663 @@
         if (fCancelable)
             ctrlSignalHandlerInstall();
+
+        vrc = RTStrmSetMode(g_pStdOut, 1 /* Binary mode */, -1 /* Code set, unchanged */);
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to set stdout's binary mode, rc=%Rrc\n", vrc);
 
         /* Wait for process to exit ... */
@@ -711 +716 @@
                     if (cbOutputData > 0)
                     {
+                        BYTE *pBuf = aOutputData.raw();
+                        AssertPtr(pBuf);
+                        pBuf[cbOutputData - 1] = 0; /* Properly terminate buffer. */
+
                         /** @todo r=bird: Use a VFS I/O stream filter for doing this, it's a
                         *        generic problem and the new VFS APIs will handle it more
@@ -721 +730 @@
                          * Windows. Otherwise we end up with CR/CR/LF on Windows.
                          */
-                        ULONG cbOutputDataPrint = cbOutputData;
-                        for (BYTE *s = aOutputData.raw(), *d = s;
-                             s - aOutputData.raw() < (ssize_t)cbOutputData;
-                             s++, d++)
+
+                        char *pszBufUTF8;
+                        vrc = RTStrCurrentCPToUtf8(&pszBufUTF8, (const char*)aOutputData.raw());
+                        if (RT_SUCCESS(vrc))
                         {
-                            if (*s == '\r')
+                            cbOutputData = strlen(pszBufUTF8);
+
+                            ULONG cbOutputDataPrint = cbOutputData;
+                            for (char *s = pszBufUTF8, *d = s;
+                                 s - pszBufUTF8 < (ssize_t)cbOutputData;
+                                 s++, d++)
                             {
-                                /* skip over CR, adjust destination */
-                                d--;
-                                cbOutputDataPrint--;
+                                if (*s == '\r')
+                                {
+                                    /* skip over CR, adjust destination */
+                                    d--;
+                                    cbOutputDataPrint--;
+                                }
+                                else if (s != d)
+                                    *d = *s;
                             }
-                            else if (s != d)
-                                *d = *s;
+
+                            vrc = RTStrmWrite(g_pStdOut, pszBufUTF8, cbOutputDataPrint);
+                            if (RT_FAILURE(vrc))
+                                RTMsgError("Unable to write output, rc=%Rrc\n", vrc);
+
+                            RTStrFree(pszBufUTF8);
                         }
-                        RTStrmWrite(g_pStdOut, aOutputData.raw(), cbOutputDataPrint);
+                        else
+                            RTMsgError("Unable to convert output, rc=%Rrc\n", vrc);
                     }
                 }
@@ -2240 +2264 @@
     AssertPtrReturn(pArg, VERR_INVALID_PARAMETER);
 
-#ifdef DEBUG_andy
+#ifdef DEBUG_andy_disabled
     if (RT_FAILURE(tstTranslatePath()))
         return RTEXITCODE_FAILURE;
@@ -2290 +2314 @@
 
         ctrlUninitVM(pArg);
-        return rcExit;
+        return RT_FAILURE(rcExit) ? RTEXITCODE_FAILURE : RTEXITCODE_SUCCESS;
     }
     return RTEXITCODE_FAILURE;