Changeset 1416 for trunk/dll/literal.c

Timestamp:

Apr 25, 2009, 5:46:39 PM (16 years ago)

Author:

Gregg Young

Message:

The palettes and system clock now work from the config toolbar (Ticket 352); Steven's cleanup of wildcard code.

File:

• trunk/dll/literal.c (modified) (2 diffs)

trunk/dll/literal.c

@@ -18 +18 @@
   16 Nov 07 SHL Report fixup buffer overflow
   15 Mar 08 KOMH Fix wildcard for multiple dots
+  24 Apr 09 SHL Rework wildcard for clarity
 
 ***********************************************************************/
@@ -204 +205 @@
  * @parm pszBuf Buffer to check
  * @parm pszWildCard wildcard to match
- * @parm fNotFileSpec TRUE if generic match else filespec match
+ * @parm fIgnorePathSep TRUE if match ignores path separators
  * @return TRUE if matched else FALSE
+ * @fixme need to rework to scan from right to left if not ignoring path separators
  */
 
-BOOL wildcard(const PSZ pszBuf, const PSZ pszWildCard,
-              const BOOL fNotFileSpec)
+BOOL wildcard(const PSZ pszBufIn, const PSZ pszWildCardIn,
+              const BOOL fIgnorePathSep)
 {
-    PSZ fstr = pszBuf;
-    PSZ fcard = pszWildCard;
-
-    while (*fstr && *fcard) {
-      switch (*fcard) {
+    PSZ pszBuf = pszBufIn;
+    PSZ pszWild = pszWildCardIn;
+
+    while (*pszBuf && *pszWild) {
+      switch (*pszWild) {
         case '*' :
         {
-          PSZ fstr1;
+          PSZ pszLook;
 
           // find next non-wild character in wildcard
-          while (*fcard && ( *fcard == '*' || *fcard == '?'))
-            fcard++;
-
-          // if last char of wildcard is *, it matches
-          if (!*fcard)
+          while (*pszWild && ( *pszWild == '*' || *pszWild == '?'))
+            pszWild++;
+
+          // if last char of wildcard is *, got match
+          if (!*pszWild)
             return TRUE;
 
-          fstr1 = fstr;
-          while (*fstr1) {
-            // skip until partition, match, or eos
-            while (*fstr1 && toupper( *fstr1 ) != toupper( *fcard ) &&
-                   (fNotFileSpec || ( *fstr1 != '/' && *fstr1 != '\\')))
-              fstr1++;
-
-            if (!*fstr1 || ( !fNotFileSpec && ( *fstr1 == '/' || *fstr1 == '\\')))
+          pszLook = pszBuf;
+          while (*pszLook) {
+            // scan until match, eos or path separator (maybe)
+            while (*pszLook && toupper(*pszLook) != toupper(*pszWild) &&
+                   (fIgnorePathSep || ( *pszLook != '/' && *pszLook != '\\')))
+              pszLook++;
+
+            // If eos or path separator (maybe), stop scan
+            if (!*pszLook || (!fIgnorePathSep && (*pszLook == '/' || *pszLook == '\\')))
               break;
 
-            if (wildcard( fstr1, fcard, fNotFileSpec ) == TRUE)
+            // Not ignoring path separators, match next path component
+            if (wildcard(pszLook, pszWild, fIgnorePathSep) == TRUE)
               return TRUE;
 
-            fstr1++;
-          }
-
-          fstr = fstr1;
+            pszLook++;
+          } // while
+
+          pszBuf = pszLook;
           break;
         }
 
         case '?' :          // character substitution
-          fcard++;
-
-          if (fNotFileSpec || ( *fstr != '.' && *fstr != '/' && *fstr != '\\'))
-            fstr++;     // skip (match) next character
+          pszWild++;
+
+          if (fIgnorePathSep || (*pszBuf != '.' && *pszBuf != '/' && *pszBuf != '\\'))
+            pszBuf++;     // skip (match) next character
           break;
 
         default :
-          if (fNotFileSpec || (*fstr  != '/' && *fstr  != '\\') ||
-              (*fcard != '/' && *fcard != '\\')) {
-            if (toupper( *fstr ) != toupper( *fcard))
+          if (fIgnorePathSep || (*pszBuf  != '/' && *pszBuf  != '\\') ||
+              (*pszWild != '/' && *pszWild != '\\')) {
+            if (toupper( *pszBuf ) != toupper( *pszWild))
               return FALSE;
           }
 
-          fcard++;
-          fstr++;
+          pszWild++;
+          pszBuf++;
           break;
+      } // switch
+    } // while
+
+    if (!*pszBuf) {
+      // Skip trailing * and ?
+      while (*pszWild && (*pszWild == '?' || *pszWild == '*'))
+        pszWild++;
+
+      if (!fIgnorePathSep) {
+        // remove trailing .
+        while (*pszWild && *pszWild == '.')
+          pszWild++;
       }
     }
 
-    if (!*fstr) {
-        // remove trailing * and ?
-      while (*fcard && ( *fcard == '?' || *fcard == '*'))
-        fcard++;
-
-      if (!fNotFileSpec) {
-        // remove trailing .
-        while (*fcard && *fcard == '.')
-          fcard++;
-      }
-    }
-
-    return (*fstr == *fcard);
+    return (*pszBuf == *pszWild);
 }