- markus@cvs.openbsd.org 2001/12/05 16:54:51

     [compat.c match.c match.h]
     make theo and djm happy: bye bye regexp

1 files changed, 20 insertions, 6 deletions

diff --git a/match.c b/match.c
index 188b9a416..ca4d92c40 100644
--- a/match.c
+++ b/match.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: match.c,v 1.14 2001/06/27 04:48:53 markus Exp $");
+RCSID("$OpenBSD: match.c,v 1.15 2001/12/05 16:54:51 markus Exp $");
 
 #include "match.h"
 #include "xmalloc.h"
@@ -104,14 +104,15 @@ match_pattern(const char *s, const char *pattern)
 }
 
 /*
- * Tries to match the host name (which must be in all lowercase) against the
+ * Tries to match the string against the
  * comma-separated sequence of subpatterns (each possibly preceded by ! to
  * indicate negation).  Returns -1 if negation matches, 1 if there is
  * a positive match, 0 if there is no match at all.
  */
 
 int
-match_hostname(const char *host, const char *pattern, u_int len)
+match_pattern_list(const char *string, const char *pattern, u_int len,
+    int dolower)
 {
         char sub[1024];
         int negated;
@@ -134,7 +135,8 @@ match_hostname(const char *host, const char *pattern, u_int len)
                 for (subi = 0;
                      i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
                      subi++, i++)
-                        sub[subi] = isupper(pattern[i]) ? tolower(pattern[i]) : pattern[i];
+                        sub[subi] = dolower && isupper(pattern[i]) ?
+                             tolower(pattern[i]) : pattern[i];
                 /* If subpattern too long, return failure (no match). */
                 if (subi >= sizeof(sub) - 1)
                         return 0;
@@ -146,8 +148,8 @@ match_hostname(const char *host, const char *pattern, u_int len)
                 /* Null-terminate the subpattern. */
                 sub[subi] = '\0';
 
-                /* Try to match the subpattern against the host name. */
-                if (match_pattern(host, sub)) {
+                /* Try to match the subpattern against the string. */
+                if (match_pattern(string, sub)) {
                         if (negated)
                                 return -1;              /* Negative */
                         else
@@ -163,6 +165,18 @@ match_hostname(const char *host, const char *pattern, u_int len)
 }
 
 /*
+ * Tries to match the host name (which must be in all lowercase) against the
+ * comma-separated sequence of subpatterns (each possibly preceded by ! to
+ * indicate negation).  Returns -1 if negation matches, 1 if there is
+ * a positive match, 0 if there is no match at all.
+ */
+int
+match_hostname(const char *host, const char *pattern, u_int len)
+{
+        return match_pattern_list(host, pattern, len, 1);
+}
+
+/*
  * returns 0 if we get a negative match for the hostname or the ip
  * or if we get no match at all.  returns 1 otherwise.
  */