Changeset 36745 in vbox

Timestamp:

Apr 20, 2011 10:08:26 AM (14 years ago)

Author:

vboxsync

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

71276

Message:

Another fix for internal toolbox invocation (argv0), logging.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceControlExec.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -588 +588 @@
      * global mutex restrictions.
      */
-# if 0 /** @todo r=bird: pending argv[0] bugfixing.  */
     if (VBoxServiceToolboxMain(argc, argv, &rcExit))
         return rcExit;
-# else
-    if (argc > 1)
-        if (VBoxServiceToolboxMain(argc - 1, &argv[1], &rcExit))
-            return rcExit;
-# endif
 #endif
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -573 +573 @@
                                              NULL /* pvData */, 0 /* cbData */);
         VBoxServiceVerbose(3, "ControlExec: Process loop ended with rc=%Rrc\n", rc);
+
+        /*
+         * Dump stdout for debugging purposes.
+         * Only do that on *very* high verbosity (5+).
+         */
+        if (g_cVerbosity >= 5)
+        {
+            uint8_t szBuf[_64K];
+            uint32_t cbOffset = 0;
+            uint32_t cbRead, cbLeft;
+            while (RT_SUCCESS(   VBoxServicePipeBufPeek(&pData->stdOut, szBuf, sizeof(szBuf),
+                                                        cbOffset, &cbRead, &cbLeft))
+                              && cbRead)
+            {
+                VBoxServiceVerbose(5, "[%u]: %s\n", pData->uPID, szBuf);
+                cbOffset += cbRead;
+                if (!cbLeft)
+                    break;
+            }
+        }
     }
     else
@@ -867 +887 @@
                 uProcFlags |= RTPROC_FLAGS_SERVICE;
 #ifdef DEBUG
-            char *pszCmdLine;
-            rc = RTGetOptArgvToString(&pszCmdLine, papszArgsExp, 0 /* Default */);
-            AssertRC(rc);
-            VBoxServiceVerbose(3, "ControlExec: Executing: %s %s\n",
-                               szExecExp, pszCmdLine);
-            RTStrFree(pszCmdLine);
+            VBoxServiceVerbose(3, "Command: %s\n", szExecExp);
+            for (size_t i = 0; papszArgsExp[i]; i++)
+                VBoxServiceVerbose(3, "\targv[%ld]: %s\n", i, papszArgsExp[i]);
 #endif
             /* Do normal execution. */