Changeset 135 for trunk/src/helpers/dosh2.c

Timestamp:

Jan 31, 2002, 11:12:45 PM (24 years ago)

Author:

umoeller

Message:

Misc speed improvements.

File:

• trunk/src/helpers/dosh2.c (modified) (6 diffs)

trunk/src/helpers/dosh2.c

@@ -2113 +2113 @@
  *          one will.
  *
+ *      --  THIS COMPARES WITH RESPECT TO CASE.
+ *
  *      This replaces strhMatchOS2 which has been removed with
  *      V0.9.16 and is a lot faster than the old code, which has
@@ -2120 +2122 @@
  */
 
-BOOL doshMatch(const char *pcszMask,     // in: mask (e.g. "*.txt")
-               const char *pcszName)     // in: string to check (e.g. "test.txt")
+BOOL doshMatchCase(const char *pcszMask,     // in: mask (e.g. "*.TXT")
+                   const char *pcszName)     // in: string to check (e.g. "TEST.TXT")
 {
     BOOL    brc = FALSE;
@@ -2128 +2130 @@
             iNameDrive = -1;
 
-    ULONG   cbMask = strlen(pcszMask),
-            cbName = strlen(pcszName);
-    PSZ     pszMask = (PSZ)_alloca(cbMask + 1),
-            pszName = (PSZ)_alloca(cbName + 1);
+    // ULONG   cbMask = strlen(pcszMask),
+    //         cbName = strlen(pcszName);
+    // PSZ     pszMask = (PSZ)_alloca(cbMask + 1),
+    //         pszName = (PSZ)_alloca(cbName + 1);
 
     PCSZ    pLastMaskComponent,
@@ -2141 +2143 @@
     CHAR    c;
 
-    memcpy(pszMask, pcszMask, cbMask + 1);
-    nlsUpper(pszMask, cbMask);
-    memcpy(pszName, pcszName, cbName + 1);
-    nlsUpper(pszName, cbName);
-
-    if (pLastMaskComponent = strrchr(pszMask, '\\'))
+    if (pLastMaskComponent = strrchr(pcszMask, '\\'))
     {
         // length of path component
-        cbMaskPath = pLastMaskComponent - pszMask;
+        cbMaskPath = pLastMaskComponent - pcszMask;
         pLastMaskComponent++;
     }
     else
-        pLastMaskComponent = pszMask;
-
-    if (pLastNameComponent = strrchr(pszName, '\\'))
+        pLastMaskComponent = pcszMask;
+
+    if (pLastNameComponent = strrchr(pcszName, '\\'))
     {
         // length of path component
-        cbNamePath = pLastNameComponent - pszName;
+        cbNamePath = pLastNameComponent - pcszName;
         pLastNameComponent++;
     }
     else
-        pLastNameComponent = pszName;
+        pLastNameComponent = pcszName;
 
     // compare paths; if the lengths are different
@@ -2168 +2165 @@
     if (    (cbMaskPath == cbNamePath)      // can both be null
          && (    (cbMaskPath == 0)
-              || (!memcmp(pszMask, pszName, cbMaskPath))
+              || (!memcmp(pcszMask, pcszName, cbMaskPath))
             )
        )
@@ -2183 +2180 @@
 }
 
-
+/*
+ *@@ doshMatch:
+ *      like doshMatchCase, but compares without respect
+ *      to case.
+ *
+ *@@added V0.9.16 (2002-01-26) [umoeller]
+ */
+
+BOOL doshMatch(const char *pcszMask,     // in: mask (e.g. "*.TXT")
+               const char *pcszName)     // in: string to check (e.g. "TEST.TXT")
+{
+    ULONG   cbMask = strlen(pcszMask),
+            cbName = strlen(pcszName);
+    PSZ     pszMask = (PSZ)_alloca(cbMask + 1),
+            pszName = (PSZ)_alloca(cbName + 1);
+
+    memcpy(pszMask, pcszMask, cbMask + 1);
+    nlsUpper(pszMask, cbMask);
+    memcpy(pszName, pcszName, cbName + 1);
+    nlsUpper(pszName, cbName);
+
+    return (doshMatchCase(pszMask,
+                          pszName));
+}