Changeset 3993 in vbox for trunk/src/VBox/HostServices

Timestamp:

Aug 2, 2007 9:29:34 AM (17 years ago)

Author:

vboxsync

Message:

Fixed dir search on linux hosts

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• testcase/tstShflCase.cpp (modified) (4 diffs)
• vbsf.cpp (modified) (2 diffs)

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

@@ -41 +41 @@
 #undef Log
 #define Log(a)  printf a
+#undef Log2
+#define Log2    Log
 
 #define RTPathQueryInfo     rtPathQueryInfo
@@ -192 +194 @@
     int            rc = VERR_FILE_NOT_FOUND;
     PRTDIR         hSearch;
+    char           szWildCard[4];
+
+    Log2(("vbsfCorrectCasing: %s %s\n", pszFullPath, pszStartComponent));
 
     cbComponent = strlen(pszStartComponent);
@@ -208 +213 @@
     *(pszStartComponent-1) = 0;
     strcpy(pDirEntry->szName, pszFullPath);
-    strcat(pDirEntry->szName, "\\*");
+    szWildCard[0] = RTPATH_DELIMITER;
+    szWildCard[1] = '*';
+    szWildCard[2] = 0;
+    strcat(pDirEntry->szName, szWildCard);
+
     rc = RTDirOpenFiltered (&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
     *(pszStartComponent-1) = RTPATH_DELIMITER;
@@ -230 +239 @@
                 continue;
         }
+
+        Log2(("vbsfCorrectCasing: found %s\n", &pDirEntry->szName[0]));
         if (    pDirEntry->cbName == cbComponent
             &&  !RTStrICmp(pszStartComponent, &pDirEntry->szName[0]))

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

@@ -101 +101 @@
     int            rc = VERR_FILE_NOT_FOUND;
     PRTDIR         hSearch;
+    char           szWildCard[4];
 
     Log2(("vbsfCorrectCasing: %s %s\n", pszFullPath, pszStartComponent));
@@ -119 +120 @@
     *(pszStartComponent-1) = 0;
     strcpy(pDirEntry->szName, pszFullPath);
-    strcat(pDirEntry->szName, "\\*");
+    szWildCard[0] = RTPATH_DELIMITER;
+    szWildCard[1] = '*';
+    szWildCard[2] = 0;
+    strcat(pDirEntry->szName, szWildCard);
+
     rc = RTDirOpenFiltered (&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
     *(pszStartComponent-1) = RTPATH_DELIMITER;