Changeset 70388 in vbox for trunk/src

Timestamp:

Dec 29, 2017 4:51:03 PM (7 years ago)

Author:

vboxsync

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

119993

Message:

Main/GuestProcessImpl.cpp: Made annoying assertion in GuestProcessTool::i_exitCodeToRc andy-only because he hasn't bothered making sure the testcase avoid this assertion yet.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (3 diffs)
• src-client/GuestProcessImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -190 +190 @@
     int  guestRc;
     /** The process tool's returned exit code. */
-    LONG lExitCode;
+    int32_t iExitCode;
 };
 
@@ -229 +229 @@
     bool i_isRunning(void);
 
-    int i_terminatedOk(LONG *plExitCode = NULL);
+    int i_terminatedOk(int32_t *piExitCode = NULL);
 
     int i_terminate(uint32_t uTimeoutMS, int *pGuestRc);
@@ -245 +245 @@
                                 GuestCtrlStreamObjects *pStrmOutObjects, uint32_t cStrmOutObjects, GuestProcessToolErrorInfo &errorInfo);
 
-    static int i_exitCodeToRc(const GuestProcessStartupInfo &startupInfo, LONG lExitCode);
-
-    static int i_exitCodeToRc(const char *pszTool, LONG lExitCode);
+    static int i_exitCodeToRc(const GuestProcessStartupInfo &startupInfo, int32_t iExitCode);
+
+    static int i_exitCodeToRc(const char *pszTool, int32_t iExitCode);
 
 protected:

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -2066 +2066 @@
     {
         if (errorInfo.guestRc == VWRN_GSTCTL_PROCESS_EXIT_CODE)
-        {
-            guestRc = GuestProcessTool::i_exitCodeToRc(startupInfo, errorInfo.lExitCode);
-        }
+            guestRc = GuestProcessTool::i_exitCodeToRc(startupInfo, errorInfo.iExitCode);
         else
             guestRc = errorInfo.guestRc;
@@ -2122 +2120 @@
     {
         if (errorInfo.guestRc == VWRN_GSTCTL_PROCESS_EXIT_CODE)
-        {
-            guestRc = GuestProcessTool::i_exitCodeToRc(startupInfo, errorInfo.lExitCode);
-        }
+            guestRc = GuestProcessTool::i_exitCodeToRc(startupInfo, errorInfo.iExitCode);
         else
             guestRc = errorInfo.guestRc;
@@ -2193 +2189 @@
         vrc = procTool.i_wait(GUESTPROCESSTOOL_FLAG_NONE, &errorInfo.guestRc);
         if (RT_SUCCESS(vrc))
-            errorInfo.guestRc = procTool.i_terminatedOk(&errorInfo.lExitCode);
-    }
-
-    LogFlowFunc(("Returned rc=%Rrc, guestRc=%Rrc, exitCode=%ld\n", vrc, errorInfo.guestRc, errorInfo.lExitCode));
+            errorInfo.guestRc = procTool.i_terminatedOk(&errorInfo.iExitCode);
+    }
+
+    LogFlowFunc(("Returned rc=%Rrc, guestRc=%Rrc, iExitCode=%d\n", vrc, errorInfo.guestRc, errorInfo.iExitCode));
     return vrc;
 }
@@ -2207 +2203 @@
  *          or VINF_SUCCESS otherwise.
  *
- * @param   plExitCode      Exit code of the tool. Optional.
+ * @param   piExitCode      Exit code of the tool. Optional.
  */
-int GuestProcessTool::i_terminatedOk(LONG *plExitCode /* = NULL */)
+int GuestProcessTool::i_terminatedOk(int32_t *piExitCode /* = NULL */)
 {
     Assert(!pProcess.isNull());
@@ -2217 +2213 @@
     if (!i_isRunning())
     {
-        LONG lExitCode = -1;
-        HRESULT hr = pProcess->COMGETTER(ExitCode(&lExitCode));
+        LONG iExitCode = -1;
+        HRESULT hr = pProcess->COMGETTER(ExitCode(&iExitCode));
         AssertComRC(hr);
 
-        if (plExitCode)
-            *plExitCode = lExitCode;
-
-        vrc = (lExitCode != 0)
-            ? VWRN_GSTCTL_PROCESS_EXIT_CODE : VINF_SUCCESS;
+        if (piExitCode)
+            *piExitCode = iExitCode;
+
+        vrc = iExitCode != 0 ? VWRN_GSTCTL_PROCESS_EXIT_CODE : VINF_SUCCESS;
     }
     else
@@ -2241 +2236 @@
 int GuestProcessTool::i_waitEx(uint32_t fFlags, GuestProcessStreamBlock *pStrmBlkOut, int *pGuestRc)
 {
-    LogFlowThisFunc(("fFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n",
-                     fFlags, pStrmBlkOut, pGuestRc));
+    LogFlowThisFunc(("fFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n", fFlags, pStrmBlkOut, pGuestRc));
 
     /* Can we parse the next block without waiting? */
@@ -2448 +2442 @@
  * Converts a toolbox tool's exit code to an IPRT error code.
  *
- * @return  int             Returned IPRT error for the particular tool.
- * @param   startupInfo     Startup info of the toolbox tool to lookup error code for.
- * @param   lExitCode       The toolbox tool's exit code to lookup IPRT error for.
+ * @return  int         Returned IPRT error for the particular tool.
+ * @param   startupInfo Startup info of the toolbox tool to lookup error code for.
+ * @param   iExitCode   The toolbox tool's exit code to lookup IPRT error for.
  */
 /* static */
-int GuestProcessTool::i_exitCodeToRc(const GuestProcessStartupInfo &startupInfo, LONG lExitCode)
+int GuestProcessTool::i_exitCodeToRc(const GuestProcessStartupInfo &startupInfo, int32_t iExitCode)
 {
     if (startupInfo.mArguments.size() == 0)
@@ -2461 +2455 @@
     }
 
-    return i_exitCodeToRc(startupInfo.mArguments[0].c_str(), lExitCode);
+    return i_exitCodeToRc(startupInfo.mArguments[0].c_str(), iExitCode);
 }
 
@@ -2469 +2463 @@
  * @return  Returned IPRT error for the particular tool.
  * @param   pszTool     Name of toolbox tool to lookup error code for.
- * @param   lExitCode   The toolbox tool's exit code to lookup IPRT error for.
+ * @param   iExitCode   The toolbox tool's exit code to lookup IPRT error for.
  */
 /* static */
-int GuestProcessTool::i_exitCodeToRc(const char *pszTool, LONG lExitCode)
+int GuestProcessTool::i_exitCodeToRc(const char *pszTool, int32_t iExitCode)
 {
     AssertPtrReturn(pszTool, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%s: %ld\n", pszTool, lExitCode));
-
-    if (lExitCode == 0) /* No error? Bail out early. */
+    LogFlowFunc(("%s: %d\n", pszTool, iExitCode));
+
+    if (iExitCode == 0) /* No error? Bail out early. */
         return VINF_SUCCESS;
 
     if (!RTStrICmp(pszTool, VBOXSERVICE_TOOL_CAT))
     {
-        switch (lExitCode)
+        switch (iExitCode)
         {
             case VBOXSERVICETOOLBOX_CAT_EXITCODE_ACCESS_DENIED:     return VERR_ACCESS_DENIED;
@@ -2495 +2489 @@
     else if (!RTStrICmp(pszTool, VBOXSERVICE_TOOL_STAT))
     {
-        switch (lExitCode)
+        switch (iExitCode)
         {
             case VBOXSERVICETOOLBOX_STAT_EXITCODE_ACCESS_DENIED:    return VERR_ACCESS_DENIED;
@@ -2504 +2498 @@
         }
     }
-
-    AssertMsgFailed(("Error code %ld for tool '%s' not handled\n", lExitCode, pszTool));
+    else if (!RTStrICmp(pszTool, VBOXSERVICE_TOOL_MKDIR))
+    {
+        switch (iExitCode)
+        {
+            case RTEXITCODE_FAILURE:                                return VERR_CANT_CREATE;
+        }
+    }
+
+#ifdef DEBUG_andy
+    AssertMsgFailed(("Exit code %d for tool '%s' not handled\n", iExitCode, pszTool));
+#endif
+    if (iExitCode == RTEXITCODE_SYNTAX)
+        return VERR_INTERNAL_ERROR_5;
     return VERR_GENERAL_FAILURE;
 }