Changeset 105 for trunk/src/helpers/stringh.c

Timestamp:

Sep 27, 2001, 10:29:02 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/stringh.c (modified) (17 diffs)

trunk/src/helpers/stringh.c

@@ -1914 +1914 @@
 /*
  * match_comp_os2:
- *      Compare a single component (directory name or file name) of the
- *      paths, for OS/2 and DOS styles.  MASK and NAME point into a
- *      component of the wildcard and the name to be checked, respectively.
- *      Comparing stops at the next separator.  The FLAGS argument is the
- *      same as that of fnmatch().  HAS_DOT is true if a dot is in the
- *      current component of NAME.  The number of dots is not restricted,
- *      even in DOS style.  Return FNM_MATCH iff MASK and NAME match.
+ *      compares a single component (directory name or file name)
+ *      of the paths, for OS/2 and DOS styles. MASK and NAME point
+ *      into a component of the wildcard and the name to be checked,
+ *      respectively. Comparing stops at the next separator.
+ *      The FLAGS argument is the same as that of fnmatch().
+ *
+ *      HAS_DOT is true if a dot is in the current component of NAME.
+ *      The number of dots is not restricted, even in DOS style.
+ *
+ *      Returns FNM_MATCH iff MASK and NAME match.
+ *
  *      Note that this function is recursive.
  *
@@ -1944 +1948 @@
                 if (*name == 0)
                     return FNM_MATCH;
-                if ((flags & _FNM_PATHPREFIX) && IS_OS2_COMP_SEP(*name))
+                if ((flags & FNM_PATHPREFIX) && IS_OS2_COMP_SEP(*name))
                     return FNM_MATCH;
                 return FNM_NOMATCH;
@@ -1959 +1963 @@
                  * is ignored at the end of NAME. */
 
-                if ((flags & _FNM_PATHPREFIX) && mask[1] == 0 && *name == 0)
+                if ((flags & FNM_PATHPREFIX) && mask[1] == 0 && *name == 0)
                     return FNM_MATCH;
 
@@ -1994 +1998 @@
                     if (IS_OS2_COMP_END(*name))
                         return FNM_NOMATCH;
-                    if (*name == '.' && (flags & _FNM_STYLE_MASK) == _FNM_DOS)
+                    if (*name == '.' && (flags & FNM_STYLE_MASK) == FNM_DOS)
                         return FNM_NOMATCH;
                     ++name;
@@ -2015 +2019 @@
                 /* All other characters match themselves. */
 
-                if (flags & _FNM_IGNORECASE)
+                if (flags & FNM_IGNORECASE)
                 {
                     if (tolower(*mask) != tolower(*name))
@@ -2033 +2037 @@
 /*
  * match_comp:
- *      compare a single component (directory name or file name) of the
- *      paths, for all styles which need component-by-component matching.
- *      MASK and NAME point to the start of a component of the wildcard and
- *      the name to be checked, respectively.  Comparing stops at the next
- *      separator.  The FLAGS argument is the same as that of fnmatch().
+ *      compares a single component (directory name or file
+ *      name) of the paths, for all styles which need
+ *      component-by-component matching. MASK and NAME point
+ *      to the start of a component of the wildcard and the
+ *      name to be checked, respectively.  Comparing stops at
+ *      the next separator. The FLAGS argument is the same as
+ *      that of fnmatch().
+ *
  *      Return FNM_MATCH iff MASK and NAME match.
  *
@@ -2049 +2056 @@
     const unsigned char *s;
 
-    switch (flags & _FNM_STYLE_MASK)
-    {
-        case _FNM_OS2:
-        case _FNM_DOS:
+    switch (flags & FNM_STYLE_MASK)
+    {
+        case FNM_OS2:
+        case FNM_DOS:
 
             /* For OS/2 and DOS styles, we add an implicit dot at the end of
@@ -2080 +2087 @@
 /*
  * match_unix:
- *      match complete paths for Unix styles.  The FLAGS argument is the
- *      same as that of fnmatch().  COMP points to the start of the current
- *      component in NAME.  Return FNM_MATCH iff MASK and NAME match.  The
+ *      matches complete paths for Unix styles.
+ *
+ *      The FLAGS argument is the same as that of fnmatch().
+ *      COMP points to the start of the current component in
+ *      NAME.  Return FNM_MATCH iff MASK and NAME match.  The
  *      backslash character is used for escaping ? and * unless
  *      FNM_NOESCAPE is set.
@@ -2110 +2119 @@
                 if (*name == 0)
                     return FNM_MATCH;
-                if ((flags & _FNM_PATHPREFIX) && IS_UNIX_COMP_SEP(*name))
+                if ((flags & FNM_PATHPREFIX) && IS_UNIX_COMP_SEP(*name))
                     return FNM_MATCH;
                 return FNM_NOMATCH;
@@ -2164 +2173 @@
 
                 if (!(IS_UNIX_COMP_SEP(*name)
-                      || ((flags & _FNM_PATHPREFIX) && *name == 0
+                      || ((flags & FNM_PATHPREFIX) && *name == 0
                       && (mask[1] == 0
                           || (!(flags & FNM_NOESCAPE) && mask[1] == '\\'
@@ -2292 +2301 @@
                 /* All other characters match themselves. */
 
-                if (flags & _FNM_IGNORECASE)
+                if (flags & FNM_IGNORECASE)
                 {
                     if (tolower(*mask) != tolower(*name))
@@ -2327 +2336 @@
                              unsigned flags)
 {
-    int             m_drive, n_drive,
-                    rc;
+    int     m_drive,
+            n_drive,
+            rc;
 
     /* Match and skip the drive name if present. */
@@ -2339 +2349 @@
         if (m_drive == -1 || n_drive == -1)
             return FNM_NOMATCH;
-        if (!(flags & _FNM_IGNORECASE))
+        if (!(flags & FNM_IGNORECASE))
             return FNM_NOMATCH;
         if (tolower(m_drive) != tolower(n_drive))
@@ -2359 +2369 @@
      * "\*\server\path".  Ditto for /. */
 
-    switch (flags & _FNM_STYLE_MASK)
-    {
-        case _FNM_OS2:
-        case _FNM_DOS:
+    switch (flags & FNM_STYLE_MASK)
+    {
+        case FNM_OS2:
+        case FNM_DOS:
 
             if (IS_OS2_COMP_SEP(name[0]) && IS_OS2_COMP_SEP(name[1]))
@@ -2373 +2383 @@
             break;
 
-        case _FNM_POSIX:
+        case FNM_POSIX:
 
             if (name[0] == '/' && name[1] == '/')
@@ -2404 +2414 @@
          * is reached even if there are components left in NAME. */
 
-        if (*mask == 0 && (flags & _FNM_PATHPREFIX))
+        if (*mask == 0 && (flags & FNM_PATHPREFIX))
             return FNM_MATCH;
 
@@ -2436 +2446 @@
  */
 
-BOOL strhMatchOS2(const unsigned char* pcszMask,     // in: mask (e.g. "*.txt")
-                  const unsigned char* pcszName)     // in: string to check (e.g. "test.txt")
-{
-    return ((BOOL)(_fnmatch_unsigned(pcszMask,
-                                     pcszName,
-                                     _FNM_OS2 | _FNM_IGNORECASE)
+BOOL strhMatchOS2(const char *pcszMask,     // in: mask (e.g. "*.txt")
+                  const char *pcszName)     // in: string to check (e.g. "test.txt")
+{
+    return ((BOOL)(_fnmatch_unsigned((const unsigned char *)pcszMask,
+                                     (const unsigned char *)pcszName,
+                                     FNM_OS2 | FNM_IGNORECASE)
+                   == FNM_MATCH)
+           );
+}
+
+/*
+ *@@ strhMatchExt:
+ *      like strhMatchOS2, but this takes all the flags
+ *      for input.
+ *
+ *@@added V0.9.15 (2001-09-14) [umoeller]
+ */
+
+BOOL strhMatchExt(const char *pcszMask,     // in: mask (e.g. "*.txt")
+                  const char *pcszName,     // in: string to check (e.g. "test.txt")
+                  unsigned flags)           // in: FNM_* flags
+{
+    return ((BOOL)(_fnmatch_unsigned((const unsigned char *)pcszMask,
+                                     (const unsigned char *)pcszName,
+                                     flags)
                    == FNM_MATCH)
            );