Changeset 98725 in vbox

Timestamp:

Feb 24, 2023 2:48:07 PM (2 years ago)

Author:

vboxsync

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

156025

Message:

Guest Control/Main: Fixed deleting files via built-in toolbox; GuestToolboxStreamBlock::GetVrc() returns VERR_NOT_FOUND when the stream block key "rc" was not found. However, some IPRT-provided tools, such as RTPathRmCmd(), only output rc on failure but not on success (exit code 0).

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -1020 +1020 @@
     const char *GetString(const char *pszKey) const;
     size_t      GetCount(void) const;
-    int         GetVrc(void) const;
+    int         GetVrc(bool fSucceedIfNotFound = false) const;
     int         GetInt64Ex(const char *pszKey, int64_t *piVal) const;
     int64_t     GetInt64(const char *pszKey) const;

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

@@ -429 +429 @@
 #endif
     /* Object name. */
-    mName = strmBlk.GetString("fname");
+    mName = strmBlk.GetString("fname"); /* Note: RTPathRmCmd() only sets this on failure. */
 
     /* Return the stream block's vrc. */
-    return strmBlk.GetVrc();
+    return strmBlk.GetVrc(true /* fSucceedIfNotFound */);
 }
 
@@ -597 +597 @@
  * @return  VBox status code.
  * @retval  VERR_NOT_FOUND if the return code string ("rc") was not found.
- */
-int GuestToolboxStreamBlock::GetVrc(void) const
+ * @param   fSucceedIfNotFound  When set to @c true, this reports back VINF_SUCCESS when the key ("rc") is not found.
+ *                              This can happen with some (older) IPRT-provided tools such as RTPathRmCmd(), which only outputs
+ *                              rc on failure but not on success. Defaults to @c false.
+ */
+int GuestToolboxStreamBlock::GetVrc(bool fSucceedIfNotFound /* = false */) const
 {
     const char *pszValue = GetString("rc");
     if (pszValue)
         return RTStrToInt16(pszValue);
+    if (fSucceedIfNotFound)
+        return VINF_SUCCESS;
     /** @todo We probably should have a dedicated error for that, VERR_GSTCTL_GUEST_TOOLBOX_whatever. */
     return VERR_NOT_FOUND;