Changeset 78703 in vbox

Timestamp:

May 24, 2019 12:23:13 AM (6 years ago)

Author:

vboxsync

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

130781

Message:

SharedFoldersSvc: Two VERR_FILE_NOT_FOUND/VERR_PATH_NOT_FOUND tweaks for windows guests on non-windows hosts. bugref:9172

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• shfl.h (modified) (1 diff)
• vbsf.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedFolders/shfl.h

@@ -66 +66 @@
 typedef SHFLCLIENTDATA *PSHFLCLIENTDATA;
 
+
+/** @def SHFL_CLIENT_NEED_WINDOWS_ERROR_STYLE_ADJUST
+ * Whether to make windows error style adjustments on a posix host.
+ * This always returns false on windows hosts. */
+#ifdef RT_OS_WINDOWS
+# define SHFL_CLIENT_NEED_WINDOWS_ERROR_STYLE_ADJUST_ON_POSIX(a_pClient) (false)
+#else
+# define SHFL_CLIENT_NEED_WINDOWS_ERROR_STYLE_ADJUST_ON_POSIX(a_pClient) ((a_pClient)->enmErrorStyle == kShflErrorStyle_Windows)
+#endif
+
 #endif /* !VBOX_INCLUDED_SRC_SharedFolders_shfl_h */
 

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -56 +56 @@
 *********************************************************************************************************************************/
 #define SHFL_RT_LINK(pClient) ((pClient)->fu32Flags & SHFL_CF_SYMLINKS ? RTPATH_F_ON_LINK : RTPATH_F_FOLLOW_LINK)
+
+
+#ifndef RT_OS_WINDOWS
+/**
+ * Helps to check if pszPath deserves a VERR_PATH_NOT_FOUND status when catering
+ * to windows guests.
+ */
+static bool vbsfErrorStyleIsWindowsPathNotFound(char *pszPath)
+{
+    /*
+     * Check if the parent directory actually exists.  We temporarily modify the path here.
+     */
+    size_t cchParent = RTPathParentLength(pszPath);
+    char chSaved = pszPath[cchParent];
+    pszPath[cchParent] = '\0';
+    RTFSOBJINFO ObjInfo;
+    int vrc = RTPathQueryInfoEx(pszPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
+    pszPath[cchParent] = chSaved;
+    if (RT_SUCCESS(vrc))
+    {
+        if (RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
+            return false;
+        return true;
+    }
+    if (vrc == VERR_FILE_NOT_FOUND || vrc == VERR_PATH_NOT_FOUND)
+        return true;
+    return false;
+}
+#endif /* RT_OS_WINDOWS */
 
 
@@ -451 +480 @@
  * @retval pParms @a Info        On success the parameters of the file opened or created
  */
-static int vbsfOpenFile(SHFLCLIENTDATA *pClient, SHFLROOT root, const char *pszPath, SHFLCREATEPARMS *pParms)
+static int vbsfOpenFile(SHFLCLIENTDATA *pClient, SHFLROOT root, char *pszPath, SHFLCREATEPARMS *pParms)
 {
     LogFlow(("vbsfOpenFile: pszPath = %s, pParms = %p\n", pszPath, pParms));
@@ -490 +519 @@
             case VERR_FILE_NOT_FOUND:
                 pParms->Result = SHFL_FILE_NOT_FOUND;
-
+#ifndef RT_OS_WINDOWS
+                if (   SHFL_CLIENT_NEED_WINDOWS_ERROR_STYLE_ADJUST_ON_POSIX(pClient)
+                    && vbsfErrorStyleIsWindowsPathNotFound(pszPath))
+                    pParms->Result = SHFL_PATH_NOT_FOUND;
+#endif
                 /* This actually isn't an error, so correct the rc before return later,
                    because the driver (VBoxSF.sys) expects rc = VINF_SUCCESS and checks the result code. */
@@ -645 +678 @@
  * @note folders are created with fMode = 0777
  */
-static int vbsfOpenDir(SHFLCLIENTDATA *pClient, SHFLROOT root, const char *pszPath,
+static int vbsfOpenDir(SHFLCLIENTDATA *pClient, SHFLROOT root, char *pszPath,
                        SHFLCREATEPARMS *pParms)
 {
@@ -705 +738 @@
             else
             {
+                /** @todo we still return 'rc' as failure here, so this is mostly pointless.  */
                 switch (rc)
                 {
                 case VERR_FILE_NOT_FOUND:  /* Does this make sense? */
                     pParms->Result = SHFL_FILE_NOT_FOUND;
+#ifndef RT_OS_WINDOWS
+                    if (   SHFL_CLIENT_NEED_WINDOWS_ERROR_STYLE_ADJUST_ON_POSIX(pClient)
+                        && vbsfErrorStyleIsWindowsPathNotFound(pszPath))
+                    {
+                        pParms->Result = SHFL_PATH_NOT_FOUND;
+                        rc = VERR_PATH_NOT_FOUND;
+                    }
+#endif
                     break;
                 case VERR_PATH_NOT_FOUND: