Fixes for corner cases (thanks, Bradley!)

icculus · Jun 11, 2003 · 33be461 · 33be461
1 parent adc1f9a
commit 33be461
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/extras/globbing.c b/extras/globbing.c
@@ -39,7 +39,11 @@ static int matchesPattern(const char *fname, const char *wildcard,
         y = *wildptr;
         if (y == '*')
         {
-            wildptr++;
+            do
+            {
+                wildptr++;  /* skip multiple '*' in a row... */
+            } while (*wildptr == '*');
+
             y = (caseSensitive) ? *wildptr : (char) tolower(*wildptr);
 
             while (1)
@@ -74,9 +78,11 @@ static int matchesPattern(const char *fname, const char *wildcard,
             if (x != y)
                 return(0);
         } /* else */
-
     } /* while */
 
+    while (*wildptr == '*')
+        wildptr++;
+
     return(*fnameptr == *wildptr);
 } /* matchesPattern */