Changeset 97456 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 8, 2022 2:56:27 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Fixed returning the correct error code from GuestSession::fsObjRemove() when a guest file can't be accessed. ​bugref:10286

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)
• src-client/GuestSessionImpl.cpp (modified) (2 diffs)

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

@@ -824 +824 @@
      * @{ */
     int FromLs(const GuestProcessStreamBlock &strmBlk, bool fLong);
+    int FromRm(const GuestProcessStreamBlock &strmBlk);
     int FromStat(const GuestProcessStreamBlock &strmBlk);
     int FromMkTemp(const GuestProcessStreamBlock &strmBlk);

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

@@ -247 +247 @@
 
 /**
+ * Parses stream block output data which came from the 'rm' (vbox_rm)
+ * VBoxService toolbox command. The result will be stored in this object.
+ *
+ * @returns VBox status code.
+ * @param   strmBlk             Stream block output data to parse.
+ */
+int GuestFsObjData::FromRm(const GuestProcessStreamBlock &strmBlk)
+{
+#ifdef DEBUG
+    strmBlk.DumpToLog();
+#endif
+    /* Object name. */
+    mName = strmBlk.GetString("fname");
+
+    /* Return the stream block's rc. */
+    return strmBlk.GetRc();
+}
+
+/**
  * Parses stream block output data which came from the 'stat' (vbox_stat)
  * VBoxService toolbox command. The result will be stored in this object.
@@ -405 +424 @@
  *
  * @return  VBox status code.
+ * @retval  VERR_NOT_FOUND if the return code string ("rc") was not found.
  */
 int GuestProcessStreamBlock::GetRc(void) const
@@ -413 +433 @@
         return RTStrToInt16(pszValue);
     }
+    /** @todo We probably should have a dedicated error for that, VERR_GSTCTL_GUEST_TOOLBOX_whatever. */
     return VERR_NOT_FOUND;
 }

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

@@ -1586 +1586 @@
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
 
-    int vrc = VINF_SUCCESS;
-
     GuestProcessStartupInfo procInfo;
     GuestProcessStream      streamOut;
@@ -1603 +1601 @@
     catch (std::bad_alloc &)
     {
-        vrc = VERR_NO_MEMORY;
-    }
-
-    if (RT_SUCCESS(vrc))
-        vrc = GuestProcessTool::run(this, procInfo, prcGuest);
-
-    LogFlowFuncLeaveRC(vrc);
+        return VERR_NO_MEMORY;
+    }
+
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    GuestCtrlStreamObjects stdOut;
+    int vrc = GuestProcessTool::runEx(this, procInfo, &stdOut, 1 /* cStrmOutObjects */, &vrcGuest);
+    if (GuestProcess::i_isGuestError(vrc))
+    {
+        if (!stdOut.empty())
+        {
+            GuestFsObjData objData;
+            vrc = objData.FromRm(stdOut.at(0));
+            if (RT_FAILURE(vrc))
+            {
+                vrcGuest = vrc;
+                if (prcGuest)
+                    *prcGuest = vrcGuest;
+                vrc = VERR_GSTCTL_GUEST_ERROR;
+            }
+        }
+        else
+            vrc = VERR_BROKEN_PIPE;
+    }
+    else if (prcGuest)
+        *prcGuest = vrcGuest;
+
+    LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, vrcGuest));
     return vrc;
 }