Changeset 77072 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 31, 2019 12:41:00 PM (6 years ago)

Author:

vboxsync

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

128522

Message:

Guest Control/Main: Fixes for GuestSession::fileExist().

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (4 diffs)

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

@@ -1576 +1576 @@
 }
 
+/**
+ * Queries information from a file on the guest.
+ *
+ * @returns IPRT status code. VERR_NOT_A_FILE if the queried file system object on the guest is not a file,
+ *                            or VERR_GSTCTL_GUEST_ERROR if prcGuest contains more error information from the guest.
+ * @param   strPath           Absolute path of file to query information for.
+ * @param   fFollowSymlinks   Whether or not to follow symbolic links on the guest.
+ * @param   objData           Where to store the acquired information.
+ * @param   prcGuest          Where to store the guest rc. Optional.
+ */
 int GuestSession::i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *prcGuest)
 {
@@ -3566 +3576 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+    /* By default we return non-existent. */
+    *aExists = FALSE;
+
     if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0'))
-    {
-        *aExists = FALSE;
         return S_OK;
-    }
 
     HRESULT hrc = i_isReadyExternal();
@@ -3579 +3589 @@
 
     GuestFsObjData objData; int rcGuest;
-    int vrc = i_fileQueryInfo(aPath, aFollowSymlinks != FALSE, objData, &rcGuest);
+    int vrc = i_fileQueryInfo(aPath, RT_BOOL(aFollowSymlinks), objData, &rcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -3589 +3599 @@
     {
         case VERR_GSTCTL_GUEST_ERROR:
-            hrc = GuestProcess::i_setErrorExternal(this, rcGuest);
+        {
+            switch (rcGuest)
+            {
+                case VERR_PATH_NOT_FOUND:
+                    RT_FALL_THROUGH();
+                case VERR_FILE_NOT_FOUND:
+                    break;
+
+                default:
+                    hrc = GuestProcess::i_setErrorExternal(this, rcGuest);
+                    break;
+            }
+
             break;
-
-/** @todo r=bird: what about VERR_PATH_NOT_FOUND and VERR_FILE_NOT_FOUND?
- *        Where does that get converted to *aExists = FALSE? */
+        }
+
         case VERR_NOT_A_FILE:
-            *aExists = FALSE;
             break;