Changeset 3954 in vbox for trunk/src

Timestamp:

Aug 1, 2007 9:09:18 AM (17 years ago)

Author:

vboxsync

Message:

Backwards compatibility with older VBox versions ensured.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxCalls.c (modified) (1 diff)
• HostServices/SharedFolders/service.cpp (modified) (1 diff)
• HostServices/SharedFolders/vbsf.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.c

@@ -217 +217 @@
         rc         = data.callInfo.result;
     }
+    else
+    if (rc == VERR_NOT_IMPLEMENTED)
+    {
+        /* try the legacy interface too; temporary to assure backwards compatibility */
+        VBoxSFMapFolder_Old data;
+
+        VBOX_INIT_CALL(&data.callInfo, MAP_FOLDER_OLD, pClient);
+
+        data.path.type                    = VMMDevHGCMParmType_LinAddr;
+        data.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
+        data.path.u.Pointer.u.linearAddr  = (VBOXGCPTR)szFolderName;
+
+        data.root.type                    = VMMDevHGCMParmType_32bit;
+        data.root.u.value32               = 0;
+
+        data.delimiter.type               = VMMDevHGCMParmType_32bit;
+        data.delimiter.u.value32          = RTPATH_DELIMITER;
+
+        rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+
+        if (VBOX_SUCCESS (rc))
+        {
+            pMap->root = data.root.u.value32;
+            rc         = data.callInfo.result;
+        }
+    }
     return rc;
 }

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

@@ -1032 +1032 @@
         {
             rc = VERR_NOT_IMPLEMENTED;
+            break;
         }
     }

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

@@ -95 +95 @@
 }
 
+static int vbsfCorrectCasing(char *pszFullPath, char *pszStartComponent)
+{
+    PRTDIRENTRYEX  pDirEntry = 0, pDirEntryOrg;
+    uint32_t       cbDirEntry, cbBufferOrg;
+    int            rc = VERR_FILE_NOT_FOUND;
+    RTDIR          hSearch;
+
+    cbDirEntry = 4096;
+    pDirEntryOrg = pDirEntry  = (PRTDIRENTRYEX)RTMemAlloc(cbDirEntry);
+    if (pDirEntry == 0)
+    {
+        AssertFailed();
+        return VERR_NO_MEMORY;
+    }
+
+    /** @todo this is quite inefficient, especially for directories with many files */
+    rc = RTDirOpenFiltered (&hSearch, pszFullPath, RTDIRFILTER_WINNT);
+    if (VBOX_FAILURE(rc))
+        goto end;
+
+    for(;;)
+    {
+        uint32_t cbDirEntrySize = cbDirEntry;
+        uint32_t cbNeeded;
+
+        pDirEntry = pDirEntryOrg;
+
+        rc = RTDirReadEx(DirHandle, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
+        if (rc == VERR_NO_MORE_FILES)
+        {
+            *pIndex = 0; /* listing completed */
+            break;
+        }
+
+        if (VINF_SUCCESS != rc && rc != VWRN_NO_DIRENT_INFO)
+        {
+            AssertFailed();
+            if (rc != VERR_NO_TRANSLATION)
+                break;
+            else
+                continue;
+        }
+
+    }
+    Assert(rc != VINF_SUCCESS);
+
+end:
+    if (pDirEntry)
+        RTMemFree(pDirEntry);
+
+    RTDirClose(hSearch);
+    return rc;
+}
+
 static int vbsfBuildFullPath (SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pPath,
                               uint32_t cbPath, char **ppszFullPath, uint32_t *pcbFullPathRoot)
@@ -247 +301 @@
             RTFSOBJINFO info;
             rc = RTPathQueryInfo (pszFullPath, &info, RTFSOBJATTRADD_NOTHING);
-            if (rc != VINF_SUCCESS)
-            {
-                char *src = pszFullPath;
+            if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
+            {
+                uint32_t len = strlen(pszFullPath);
+                char    *src = pszFullPath + len - 1;
                 
-                Assert(rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
-                Log(("Handle case insenstive guest fs on top of host case sensitive fs for %ws\n", pszFullPath));
-                while(*src)
+                Log(("Handle case insenstive guest fs on top of host case sensitive fs for %s\n", pszFullPath));
+
+                /* Find partial path that's valid */
+                while(src > pszFullPath)
                 {
                     if (*src == RTPATH_DELIMITER)
-                        break;
-                    src++;
+                    {
+                        *src = 0;
+                        rc = RTPathQueryInfo (pszFullPath, &info, RTFSOBJATTRADD_NOTHING);
+                        *src = RTPATH_DELIMITER;
+                        if (rc == VINF_SUCCESS)
+                        {
+#ifdef DEBUG
+                            *src = 0;
+                            Log(("Found valid partial path %s\n", pszFullPath));
+                            *src = RTPATH_DELIMITER;
+#endif
+                            break;
+                        }
+                    }
+
+                    src--;
                 }
-                Assert(*src);
-                if (*src)
+                Assert(*src == RTPATH_DELIMITER && VBOX_SUCCESS(rc));
+                if (    *src == RTPATH_DELIMITER 
+                    &&  VBOX_SUCCESS(rc))
                 {
                     src++;
@@ -279 +350 @@
                     
                         rc = RTPathQueryInfo(src, &info, RTFSOBJATTRADD_NOTHING);
-                        if (rc != VINF_SUCCESS)
+                        Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
+                        if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
                         {
-                            Assert(rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
+                            /* path component is invalid; try to correct the casing */
+                            rc = vbsfCorrectCasing(pszFullPath, src);
+                            if (VBOX_FAILURE(rc))
+                                break;
                         }
 
@@ -287 +362 @@
                         src = end + 1;
                     }
+                    Assert(rc == VINF_SUCCESS);
                 }
-
-            }
-            rc = VINF_SUCCESS;
+                else
+                    rc = VERR_FILE_NOT_FOUND;
+
+            }
         }
 #endif