Changeset 13444 in vbox

Timestamp:

Oct 21, 2008 1:43:12 PM (16 years ago)

Author:

vboxsync

Message:

Main (Guest Properties): rewrites to globbing code

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2840 +2840 @@
 static bool matchesSinglePatternEx(const char *pszPat, size_t cchPat, const char *pszName)
 {
-    size_t iPat = 0;
     /* ASSUMES ASCII */
     for (;;)
     {
-        char chPat = pszPat[iPat];
+        char chPat = *pszPat;
         switch (chPat)
         {
@@ -2854 +2853 @@
             case '*':
             {
-                while (   ((chPat = pszPat[++iPat]) == '*' || chPat == '?')
-                       && (iPat < cchPat)
+                while (   (--cchPat > 0)
+                       && ((chPat = *++pszPat) == '*' || chPat == '?')
                       )
                     /* nothing */;
@@ -2864 +2863 @@
                     if (    ch == chPat
                         &&  (   !chPat
-                             || matchesSinglePatternEx(pszPat + iPat + 1,
-                                                       cchPat - iPat - 1, pszName)
+                             || matchesSinglePatternEx(pszPat + 1,
+                                                       cchPat - 1, pszName)
                             )
                        )
@@ -2886 +2885 @@
         pszName++;
         pszPat++;
-        if (iPat == cchPat)
+        if (--cchPat == 0)
             return !*pszName;
+        Assert(cchPat > 0);
     }
     return true;
@@ -2905 +2905 @@
     size_t iOffs = 0;
     /* If the first pattern in the list is empty, treat it as "match all". */
-    bool matched = (cchPatterns > 0) && (0 == *paszPatterns) ? true : false;
+    bool matched = (cchPatterns > 0) && (0 == *paszPatterns);
     while ((iOffs < cchPatterns) && !matched)
     {
@@ -2931 +2931 @@
     const char *pcszCur = pcszPatterns;
     /* If list is empty, treat it as "match all". */
-    bool matched = (0 == *pcszPatterns) ? true : false;
+    bool matched = (0 == *pcszPatterns);
     bool done = false;
     while (!done && !matched)