cleanup: All the whitespace fixes, all at once.

[mLib] / str.c

diff --git a/str.c b/str.c
index 36dea7add202222febc92aea1d1951894cfa91db..8e3f43ab1eb5a12d29e44d27deebdf4f0d2b0f12 100644 (file)
--- a/str.c
+++ b/str.c
@@ -7,7 +7,7 @@
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -183,10 +183,11 @@ char *str_getword(char **pp) { return (str_qword(pp, 0)); }
 size_t str_split(char *p, char *v[], size_t c, char **rest)
   { return (str_qsplit(p, v, c, rest, 0)); }
 
-/* --- @str_match@ --- *
+/* --- @str_matchx@ --- *
  *
  * Arguments:  @const char *p@ = pointer to pattern string
  *             @const char *s@ = string to compare with
+ *             @unsigned f@ = various flags
  *
  * Returns:    Nonzero if the pattern matches the string.
  *
@@ -195,12 +196,14 @@ size_t str_split(char *p, char *v[], size_t c, char **rest)
  *             '['.
  */
 
-int str_match(const char *p, const char *s)
+int str_matchx(const char *p, const char *s, unsigned f)
 {
   for (;;) {
     char pch = *p++, pche, sch;
     int sense;
 
+    if ((f & STRF_PREFIX) && !*s)
+      return (1);
     switch (pch) {
       case '?':
        if (!*s)
@@ -208,7 +211,7 @@ int str_match(const char *p, const char *s)
        s++;
        break;
       case '*':
-       if (!*p)
+       if (!*p || (f & STRF_PREFIX))
          return (1);
        while (*s) {
          if (str_match(p, s))
@@ -277,6 +280,20 @@ int str_match(const char *p, const char *s)
   }
 }
 
+/* --- @str_match@ --- *
+ *
+ * Arguments:  @const char *p@ = pointer to pattern string
+ *             @const char *s@ = string to compare with
+ *
+ * Returns:    Nonzero if the pattern matches the string.
+ *
+ * Use:                Does simple wildcard matching.  Equivalent to @str_matchx@
+ *             with zero flags word.
+ */
+
+int str_match(const char *p, const char *s)
+  { return (str_matchx(p, s, 0)); }
+
 /* --- @str_sanitize@ --- *
  *
  * Arguments:  @char *d@ = destination buffer