Changeset 832 for trunk/dll/literal.c

Timestamp:

Sep 5, 2007, 4:09:22 AM (18 years ago)

Author:

Gregg Young

Message:

Initial implimentation of a more flexible mask matching system to address multiple "." in file names

File:

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

trunk/dll/literal.c

@@ -204 +204 @@
               const BOOL fNotFileSpec)
 {
-  const CHAR *fstr = pszBuf;
-  PSZ fcard = pszWildCard;
+
+  const CHAR *fstr = strrev(pszBuf);
+  PSZ fcard = strrev(pszWildCard);
   INT wmatch = TRUE;
-
   while (wmatch && *fcard && *fstr) {
-    switch (*fcard) {
+  switch (*fcard) {
     case '?':                                /* character substitution */
       fcard++;
@@ -219 +219 @@
       /* find next non-wild character in wildcard */
       while (*fcard && (*fcard == '?' || *fcard == '*'))
-        fcard++;
-      if (!*fcard)                        /* if last char of wildcard is *, it matches */
+       fcard++;
+      if (!*fcard){                        /* if last char of wildcard is *, it matches */
+        fstr = strrev(pszBuf);
+        fcard = strrev(pszWildCard);
         return TRUE;
+      }
       /* skip until partition, match, or eos */
       while (*fstr && toupper(*fstr) != toupper(*fcard) &&
              (fNotFileSpec || (*fstr != '\\' &&
-                               *fstr != '/' && *fstr != '.')))
+                             *fstr != '/' && *fstr != '.')))
         fstr++;
       if (!fNotFileSpec && !*fstr)        /* implicit '.' */
@@ -234 +237 @@
     default:
       if (!fNotFileSpec && ((*fstr == '/' || *fstr == '\\') &&
-                            (*fcard == '/' || *fcard == '\\')))
+                          (*fcard == '/' || *fcard == '\\')))
         wmatch = TRUE;
       else
@@ -243 +246 @@
     }
   }
+  if ((*fcard && *fcard != '*') || *fstr){
+    fstr = strrev(pszBuf);
+    fcard = strrev(pszWildCard);
+    return 0;
+  }
+  else{
+    fstr = strrev(pszBuf);
+    fcard = strrev(pszWildCard);
+    return wmatch;
+  }
+}
+
+BOOL wildcard2(const PSZ pszBuf, const PSZ pszWildCard,
+              const BOOL fNotFileSpec)
+{
+  const CHAR *fstr = pszBuf;
+  PSZ fcard = pszWildCard;
+  CHAR tcard[50];
+  INT wmatch = TRUE;
+
+    while (wmatch && *fcard && *fstr) {
+      switch (*fcard) {
+       case '?':                                /* character substitution */
+         fcard++;
+         if (fNotFileSpec || (*fstr != '.' && *fstr != '/' && *fstr != '\\'))
+           fstr++;                                /* skip (match) next character */
+         break;
+
+       case '*':
+         /* find next non-wild character in wildcard */
+         while (*fcard && (*fcard == '?' || *fcard == '*'))
+           fcard++;
+         if (!*fcard)                        /* if last char of wildcard is *, it matches */
+           return TRUE;
+         /* skip until partition, match, or eos */
+         while (*fstr && toupper(*fstr) != toupper(*fcard) &&
+                (fNotFileSpec || (*fstr != '\\' &&
+                                  *fstr != '/' && *fstr != '.')))
+           fstr++;
+         if (!fNotFileSpec && !*fstr)        /* implicit '.' */
+           if (*fcard == '.')
+             fcard++;
+         break;
+
+       default:
+         if (!fNotFileSpec && ((*fstr == '/' || *fstr == '\\') &&
+                               (*fcard == '/' || *fcard == '\\')))
+           wmatch = TRUE;
+         else
+           wmatch = (toupper(*fstr) == toupper(*fcard));
+         fstr++;
+         fcard++;
+         break;
+       }
+  }  //while
 
   if ((*fcard && *fcard != '*') || *fstr)
@@ -249 +307 @@
     return wmatch;
 }
+
 
 // fixup - quote literal character array
@@ -298 +357 @@
 }
 
-#pragma alloc_text(LITERAL,literal,index,fixup,wildcard)
-
+#pragma alloc_text(LITERAL,literal,index,fixup,wildcard, wildcard2)
+