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

Timestamp:

Jul 28, 2002, 11:48:47 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

File:

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

trunk/src/helpers/dosh2.c

@@ -2046 +2046 @@
 
                 // skip extra asterisks
+                /*
                 do
                 {
                     ++pMask;
                 } while (*pMask == '*');
+                */
+
+                while (*(++pMask) == '*')       // V0.9.20 (2002-07-25) [umoeller]
+                    ;
 
                 // pMask points to after '*';
@@ -2089 +2094 @@
 
 /*
- *@@ doshMatch:
+ *@@ doshMatchCase:
  *      this matches '*' and '?' wildcards, similar to what
- *      DosEditName does. It returns TRUE if the given name
- *      matches the given mask.
- *
- *      However, this does not require a file to be present, but
- *      works on strings only.
+ *      DosEditName does. However, this does not require a
+ *      file to be present, but works on strings only.
+ *
+ *      Returns TRUE if the given name matches the given mask.
  *
  *      This accepts both short and fully qualified masks and
@@ -2106 +2110 @@
  *          wildcards.
  *
- *      --  This compares without respect to case always.
+ *      --  This compares WITH respect to case always. Upper-case
+ *          both the mask and the name before calling this, or
+ *          use doshMatch instead.
  *
  *      --  As opposed to the WPS, this handles multiple dots in
@@ -2113 +2119 @@
  *          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
@@ -2127 +2131 @@
     BOOL    brc = FALSE;
 
-    int     iMaskDrive = -1,
-            iNameDrive = -1;
-
     PCSZ    pLastMaskComponent,
             pLastNameComponent;
@@ -2135 +2136 @@
     ULONG   cbMaskPath = 0,
             cbNamePath = 0;
-
-    CHAR    c;
 
     if (pLastMaskComponent = strrchr(pcszMask, '\\'))
@@ -2176 +2175 @@
 
 /*
+ *@@ doshMatchCaseNoPath:
+ *      like doshMatchCase, but is faster if you are sure that
+ *      neither pcszMask nor pcszName contain path separators
+ *      ("\" characters). In other words, this is for short
+ *      filenames.
+ *
+ *@@added V0.9.20 (2002-07-25) [umoeller]
+ */
+
+BOOL doshMatchCaseNoPath(const char *pcszMask,     // in: mask (e.g. "*.TXT")
+                         const char *pcszName)     // in: string to check (e.g. "TEST.TXT")
+{
+    return PerformMatch(pcszMask,
+                        pcszName,
+                        // has dot?
+                        (strchr(pcszName, '.') != NULL));
+}
+
+/*
  *@@ doshMatch:
  *      like doshMatchCase, but compares without respect
@@ -2192 +2210 @@
 
     memcpy(pszMask, pcszMask, cbMask + 1);
-    nlsUpper(pszMask, cbMask);
+    nlsUpper(pszMask);
     memcpy(pszName, pcszName, cbName + 1);
-    nlsUpper(pszName, cbName);
-
-    return (doshMatchCase(pszMask,
-                          pszName));
-}
+    nlsUpper(pszName);
+
+    return doshMatchCase(pszMask,
+                         pszName);
+}