Ticket #235: wildcard.diff

literal.c

@@ -203 +203 @@
 BOOL wildcard(const PSZ pszBuf, const PSZ pszWildCard,
               const BOOL fNotFileSpec)
 {
-  const CHAR *fstr = pszBuf;
+    PSZ fstr = pszBuf;
   PSZ fcard = pszWildCard;
-  INT wmatch = TRUE;
 
-  while (wmatch && *fcard && *fstr) {
-    switch (*fcard) {
-    case '?':                           /* character substitution */
-      fcard++;
-      if (fNotFileSpec || (*fstr != '.' && *fstr != '/' && *fstr != '\\'))
-        fstr++;                         /* skip (match) next character */
-      break;
+    while( *fstr && *fcard )
+    {
+        switch( *fcard )
+        {
+            case '*' :
+            {
+                PSZ fstr1;
 
-    case '*':
       /* find next non-wild character in wildcard */
-      while (*fcard && (*fcard == '?' || *fcard == '*'))
+                while( *fcard && ( *fcard == '*' || *fcard == '?'))
         fcard++;
-      if (!*fcard)                      /* if last char of wildcard is *, it matches */
+
+                /* if last char of wildcard is *, it matches */
+                if( !*fcard )
         return TRUE;
+
+                fstr1 = fstr;
+                while( *fstr1 )
+                {
       /* skip until partition, match, or eos */
-      while (*fstr && toupper(*fstr) != toupper(*fcard) &&
-             (fNotFileSpec || (*fstr != '\\' &&
-                               *fstr != '/' && *fstr != '.')))
-        fstr++;
-      if (!fNotFileSpec && !*fstr)      /* implicit '.' */
-        if (*fcard == '.')
+                    while( *fstr1 && toupper( *fstr1 ) != toupper( *fcard ) &&
+                           ( fNotFileSpec || ( *fstr1 != '/' && *fstr1 != '\\' )))
+                        fstr1++;
+
+                    if( !*fstr1 || ( !fNotFileSpec && ( *fstr1 == '/' || *fstr1 == '\\' )))
+                        break;
+
+                    if( wildcard( fstr1, fcard, fNotFileSpec ) == TRUE )
+                        return TRUE;
+
+                    fstr1++;
+                }
+
+                fstr = fstr1;
+                break;
+            }
+
+            case '?' :          /* character substitution */
           fcard++;
+
+                if( fNotFileSpec || ( *fstr != '.' && *fstr != '/' && *fstr != '\\'))
+                    fstr++;     /* skip (match) next character */
       break;
 
     default:
-      if (!fNotFileSpec && ((*fstr == '/' || *fstr == '\\') &&
-                            (*fcard == '/' || *fcard == '\\')))
-        wmatch = TRUE;
-      else
-        wmatch = (toupper(*fstr) == toupper(*fcard));
+                if( fNotFileSpec ||
+                    ( *fstr  != '/' && *fstr  != '\\') ||
+                    ( *fcard != '/' && *fcard != '\\' ))
+                {
+                    if( toupper( *fstr ) != toupper( *fcard ))
+                        return FALSE;
+                }
+
+                fcard++;
       fstr++;
-      fcard++;
       break;
     }
   }
 
-  if ((*fcard && *fcard != '*') || *fstr)
-    return 0;
-  else
-    return wmatch;
+    if( !*fstr )
+    {
+        /* remove trailing * and ? */
+        while( *fcard && ( *fcard == '?' || *fcard == '*' ))
+            fcard++;
+
+        if( !fNotFileSpec )
+        {
+            /* remove trailing . */
+            while( *fcard && *fcard == '.' )
+                fcard++;
 }
+    }
 
+    return ( *fstr == *fcard );
+}
+
 // fixup - quote literal character array
 
 PSZ fixup(const PCH pachIn, PSZ pszOutBuf, const UINT cBufBytes,