Changeset 3960 in vbox for trunk/src

Timestamp:

Aug 1, 2007 1:16:09 PM (17 years ago)

Author:

vboxsync

Message:

Corrections

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• testcase/tstShflCase.cpp (modified) (3 diffs)
• vbsf.cpp (modified) (9 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp

@@ -202 +202 @@
     strcpy(pDirEntry->szName, pszFullPath);
     strcat(pDirEntry->szName, "\\*");
-    rc = rtDirOpenFiltered (&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
+    rc = RTDirOpenFiltered (&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
     *(pszStartComponent-1) = RTPATH_DELIMITER;
     if (VBOX_FAILURE(rc))
@@ -211 +211 @@
         uint32_t cbDirEntrySize = cbDirEntry;
 
-        rc = rtDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
+        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
         if (rc == VERR_NO_MORE_FILES)
             break;
@@ -238 +238 @@
         RTMemFree(pDirEntry);
 
-    rtDirClose(hSearch);
+    RTDirClose(hSearch);
     return rc;
 }

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

@@ -94 +94 @@
     LogFlowFunc(("%s, %s, %s\n", pszFullPath, delimLast, delimSecondLast));
 }
-#if 0
+
 static int vbsfCorrectCasing(char *pszFullPath, char *pszStartComponent)
 {
-    PRTDIRENTRYEX  pDirEntry = 0, pDirEntryOrg;
-    uint32_t       cbDirEntry, cbBufferOrg;
+    PRTDIRENTRYEX  pDirEntry = NULL;
+    uint32_t       cbDirEntry, cbComponent;
     int            rc = VERR_FILE_NOT_FOUND;
-    RTDIR          hSearch;
+    PRTDIR         hSearch;
+
+    cbComponent = strlen(pszStartComponent);
 
     cbDirEntry = 4096;
-    pDirEntryOrg = pDirEntry  = (PRTDIRENTRYEX)RTMemAlloc(cbDirEntry);
+    pDirEntry  = (PRTDIRENTRYEX)RTMemAlloc(cbDirEntry);
     if (pDirEntry == 0)
     {
@@ -111 +113 @@
 
     /** @todo this is quite inefficient, especially for directories with many files */
-    rc = RTDirOpenFiltered (&hSearch, pszFullPath, RTDIRFILTER_WINNT);
+    Assert(pszFullPath < pszStartComponent-1);
+    Assert(*(pszStartComponent-1) == RTPATH_DELIMITER);
+    *(pszStartComponent-1) = 0;
+    strcpy(pDirEntry->szName, pszFullPath);
+    strcat(pDirEntry->szName, "\\*");
+    rc = RTDirOpenFiltered (&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
+    *(pszStartComponent-1) = RTPATH_DELIMITER;
     if (VBOX_FAILURE(rc))
         goto end;
@@ -118 +126 @@
     {
         uint32_t cbDirEntrySize = cbDirEntry;
-        uint32_t cbNeeded;
-
-        pDirEntry = pDirEntryOrg;
-
-        rc = RTDirReadEx(DirHandle, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
+
+        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
         if (rc == VERR_NO_MORE_FILES)
-        {
-            *pIndex = 0; /* listing completed */
             break;
-        }
 
         if (VINF_SUCCESS != rc && rc != VWRN_NO_DIRENT_INFO)
@@ -137 +139 @@
                 continue;
         }
-
-    }
-    Assert(rc != VINF_SUCCESS);
+        if (    pDirEntry->cbName == cbComponent
+            &&  !RTStrICmp(pszStartComponent, &pDirEntry->szName[0]))
+        {
+            Log(("Found original name %s (%s)\n", &pDirEntry->szName[0], pszStartComponent));
+            strcpy(pszStartComponent, &pDirEntry->szName[0]);
+            rc = VINF_SUCCESS;
+            break;
+        }
+    }
+    Assert(VBOX_SUCCESS(rc));
 
 end:
@@ -148 +157 @@
     return rc;
 }
-#endif
 
 static int vbsfBuildFullPath (SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pPath,
@@ -301 +309 @@
         {
             RTFSOBJINFO info;
-            rc = RTPathQueryInfo (pszFullPath, &info, RTFSOBJATTRADD_NOTHING);
+            rc = RTPathQueryInfo(pszFullPath, &info, RTFSOBJATTRADD_NOTHING);
             if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
             {
                 uint32_t len = strlen(pszFullPath);
                 char    *src = pszFullPath + len - 1;
-                
+        
                 Log(("Handle case insenstive guest fs on top of host case sensitive fs for %s\n", pszFullPath));
 
@@ -338 +346 @@
                     {
                         char *end = src;
+                        bool fEndOfString = true;
 
                         while(*end)
@@ -345 +354 @@
                             end++;
                         }
-                        if (!*end)
-                            break;
-
-                        *end = 0;
-                    
-                        rc = RTPathQueryInfo(src, &info, RTFSOBJATTRADD_NOTHING);
-                        Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
+
+                        if (*end == RTPATH_DELIMITER)
+                        {
+                            fEndOfString = false;
+                            *end = 0;
+                            rc = RTPathQueryInfo(src, &info, RTFSOBJATTRADD_NOTHING);
+                            Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
+                        }
+                        else
+                            rc = VERR_FILE_NOT_FOUND;
+            
                         if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
                         {
@@ -359 +372 @@
                                 break;
                         }
+
+                        if (fEndOfString)
+                            break;
 
                         *end = RTPATH_DELIMITER;