Changeset 834 for trunk/dll/literal.c

Timestamp:

Sep 12, 2007, 9:20:07 PM (18 years ago)

Author:

Gregg Young

Message:

Improved file filtering logic to match last extention for file associations (types) (reverse character by character matching) and optionally search for complete strings within a file name (strstr matching).

File:

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

trunk/dll/literal.c

@@ -204 +204 @@
               const BOOL fNotFileSpec)
 {
-
-  const CHAR *fstr = strrev(pszBuf);
-  PSZ fcard = strrev(pszWildCard);
+  const CHAR *fstr = pszBuf;
+  PSZ fcard = pszWildCard;
+  CHAR *tcard;
   INT wmatch = TRUE;
+  BOOL reverse = FALSE;
+
   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 */
+    if (*fcard == '*' && fcard[strlen(fcard) - 1] == '*' && !reverse){
+      tcard  = xstrdup(fcard + 1, __FILE__, __LINE__);
+      tcard[strlen(tcard) - 1] = 0;
+      if (!(strchr(tcard, '?')) && !(strchr(tcard, '*'))){
+        if (strstr(fstr, tcard)){ //strstr match for *stuff* pattern no wildcards in "stuff"
+          xfree(tcard);
+          return TRUE;
+        }
+        else{
+          xfree(tcard);
+          return FALSE;
+        }
+      }
+      xfree(tcard);
+    }
+    else   //reverse search for *stuff pattern "stuff" can contain wildcards
+      if (*fcard == '*' && fcard[strlen(fcard) - 1] != '*'){
         fstr = strrev(pszBuf);
         fcard = strrev(pszWildCard);
-        return TRUE;
-      }
-      /* skip until partition, match, or eos */
-      while (*fstr && toupper(*fstr) != toupper(*fcard) &&
-             (fNotFileSpec || (*fstr != '\\' &&
-                             *fstr != '/' && *fstr != '.')))
+        reverse = TRUE;
+      }
+     switch (*fcard) { //fm2 standard forward search for all other cases
+      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 */
+          if (reverse){
+            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++;
+        if (!fNotFileSpec && !*fstr)        /* implicit '.' */
+          if (*fcard == '.')
+            fcard++;
+        break;
+
+      default:
+        if (!fNotFileSpec && ((*fstr == '/' || *fstr == '\\') &&
+                              (*fcard == '/' || *fcard == '\\')))
+          wmatch = TRUE;
+        else
+          wmatch = (toupper(*fstr) == toupper(*fcard));
         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;
+        fcard++;
+        break;
+      }
+  }  //while
+
+  if ((*fcard && *fcard != '*') || *fstr){
+    if (reverse){
+      fstr = strrev(pszBuf);
+      fcard = strrev(pszWildCard);
     }
-  }
-  if ((*fcard && *fcard != '*') || *fstr){
-    fstr = strrev(pszBuf);
-    fcard = strrev(pszWildCard);
     return 0;
   }
-  else{
-    fstr = strrev(pszBuf);
-    fcard = strrev(pszWildCard);
+  else {
+    if (reverse){
+      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)
-    return 0;
-  else
-    return wmatch;
 }
 
@@ -357 +337 @@
 }
 
-#pragma alloc_text(LITERAL,literal,index,fixup,wildcard, wildcard2)
-
+#pragma alloc_text(LITERAL,literal,index,fixup,wildcard)
+