Changeset 3972 in vbox for trunk/src

Timestamp:

Aug 1, 2007 3:50:59 PM (17 years ago)

Author:

vboxsync

Message:

Correction for wildcard-less directory listing

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

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

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

@@ -272 +272 @@
         if (*src == RTPATH_DELIMITER)
         {
-            pszWildCardComponent = src;
-            *pszWildCardComponent = 0;
+            bool fHaveWildcards = false;
+            char *temp = src;
+
+            while(*temp)
+            {
+                char uc = *temp;
+                /** @todo should depend on the guest OS */
+                if (uc == '*' || uc == '?' || uc == '>' || uc == '<' || uc == '"')
+                {
+                    fHaveWildcards = true;
+                    break;
+                }
+                temp++;
+            }
+
+            if (fHaveWildcards)
+            {
+                pszWildCardComponent = src;
+                *pszWildCardComponent = 0;
+            }
         }
     }
@@ -357 +375 @@
 
     }
-    if (fWildCard)
-    {
-        Assert(pszWildCardComponent);
+    if (pszWildCardComponent)
         *pszWildCardComponent = RTPATH_DELIMITER;
-    }
 
     if (VBOX_SUCCESS(rc))
@@ -386 +401 @@
     testCase(szTest, true);
     strcpy(szTest, "c:\\TEST dir\\subDiR\\");
-    testCase(szTest);
+    testCase(szTest ,true);
     strcpy(szTest, "c:\\test dir\\SUBDIR\\");
     testCase(szTest);

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

@@ -325 +325 @@
                 if (*src == RTPATH_DELIMITER)
                 {
-                    pszWildCardComponent = src;
-                    *pszWildCardComponent = 0;
+                    bool fHaveWildcards = false;
+                    char *temp = src;
+
+                    while(*temp)
+                    {
+                        char uc = *temp;
+                        if (uc == '*' || uc == '?' || uc == '>' || uc == '<' || uc == '"')
+                        {
+                            fHaveWildcards = true;
+                            break;
+                        }
+                        temp++;
+                    }
+
+                    if (fHaveWildcards)
+                    {
+                        pszWildCardComponent = src;
+                        *pszWildCardComponent = 0;
+                    }
                 }
             }
@@ -410 +427 @@
 
             }
-            if (fWildCard)
-            {
-                Assert(pszWildCardComponent);
+            if (pszWildCardComponent)
                 *pszWildCardComponent = RTPATH_DELIMITER;
-            }
         }
         *ppszFullPath = pszFullPath;