WHOIS command: make sure matching is case-insensitive

[ngircd-alex.git] / src / ngircd / match.c

diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index 2ba5bcae00001d260edc591dcba0383ee4453349..79699ea0d8740b7cf555af732d3c22ec1dfc9861 100644 (file)
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -7,14 +7,14 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Wildcard pattern matching
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: match.c,v 1.2 2002/12/12 12:24:18 alex Exp $";
+/**
+ * @file
+ * Wildcard pattern matching
+ */
 
 #include "imp.h"
 #include <assert.h>
@@ -22,44 +22,69 @@ static char UNUSED id[] = "$Id: match.c,v 1.2 2002/12/12 12:24:18 alex Exp $";
 
 #include "exp.h"
 #include "match.h"
+#include "defines.h"
+#include "tool.h"
 
 
 /*
- * Die Pattern-Matching-Funkionen [Matche(), Matche_After_Star()] basieren
- * auf Versionen von J. Kercheval. Die Version 1.1 wurde am 12.03.1991 als
- * "public domain" freigegeben:
- * <http://www.snippets.org/snippets/portable/MATCH+C.php3>
+ * The pattern matching functions [Matche(), Matche_After_Star()] are based
+ * on code of J. Kercheval. Version 1.1 has been released on 1991-03-12 as
+ * "public domain": <http://c.snippets.org/snip_lister.php?fname=match.c>
  */
 
 
-LOCAL INT Matche PARAMS(( REGISTER CHAR *p, REGISTER CHAR *t ));
-LOCAL INT Matche_After_Star PARAMS(( REGISTER CHAR *p, REGISTER CHAR *t ));
+static int Matche PARAMS(( const char *p, const char *t ));
+static int Matche_After_Star PARAMS(( const char *p, const char *t ));
 
 
-#define MATCH_PATTERN  6       /* bad pattern */
-#define MATCH_LITERAL  5       /* match failure on literal match */
-#define MATCH_RANGE    4       /* match failure on [..] construct */
-#define MATCH_ABORT    3       /* premature end of text string */
-#define MATCH_END      2       /* premature end of pattern string */
-#define MATCH_VALID    1       /* valid match */
+#define MATCH_PATTERN  6       /**< bad pattern */
+#define MATCH_LITERAL  5       /**< match failure on literal match */
+#define MATCH_RANGE    4       /**< match failure on [..] construct */
+#define MATCH_ABORT    3       /**< premature end of text string */
+#define MATCH_END      2       /**< premature end of pattern string */
+#define MATCH_VALID    1       /**< valid match */
 
 
-GLOBAL BOOLEAN
-Match( CHAR *Pattern, CHAR *String )
+/**
+ * Match string with pattern.
+ *
+ * @param Pattern      Pattern to match with
+ * @param String       Input string
+ * @return             true if pattern matches
+ */
+GLOBAL bool
+Match( const char *Pattern, const char *String )
 {
        /* Pattern mit String vergleichen */
-       if( Matche( Pattern, String ) == MATCH_VALID ) return TRUE;
-       else return FALSE;
+       if( Matche( Pattern, String ) == MATCH_VALID ) return true;
+       else return false;
 } /* Match */
 
 
-LOCAL INT
-Matche( REGISTER CHAR *p, REGISTER CHAR *t )
+/**
+ * Match string with pattern case-insensitive.
+ *
+ * @param pattern      Pattern to match with
+ * @param searchme     Input string, at most COMMAND_LEN-1 characters long
+ * @return             true if pattern matches
+ */
+GLOBAL bool
+MatchCaseInsensitive(const char *pattern, const char *searchme)
+{
+       char haystack[COMMAND_LEN];
+
+       strlcpy(haystack, searchme, sizeof(haystack));
+       return Match(pattern, ngt_LowerStr(haystack));
+} /* MatchCaseInsensitive */
+
+
+static int
+Matche( const char *p, const char *t )
 {
-       REGISTER CHAR range_start, range_end;
-       BOOLEAN invert;
-       BOOLEAN member_match;
-       BOOLEAN loop;
+       register char range_start, range_end;
+       bool invert;
+       bool member_match;
+       bool loop;
 
        for( ; *p; p++, t++ )
        {
@@ -83,25 +108,25 @@ Matche( REGISTER CHAR *p, REGISTER CHAR *t )
                                p++;
 
                                /* check if this is a member match or exclusion match */
-                               invert = FALSE;
+                               invert = false;
                                if( *p == '!' || *p == '^' )
                                {
-                                       invert = TRUE;
+                                       invert = true;
                                        p++;
                                }
 
                                /* if closing bracket here or at range start then we have a malformed pattern */
                                if ( *p == ']' ) return MATCH_PATTERN;
 
-                               member_match = FALSE;
-                               loop = TRUE;
+                               member_match = false;
+                               loop = true;
 
                                while( loop )
                                {
                                        /* if end of construct then loop is done */
                                        if( *p == ']' )
                                        {
-                                               loop = FALSE;
+                                               loop = false;
                                                continue;
                                        }
 
@@ -140,16 +165,16 @@ Matche( REGISTER CHAR *p, REGISTER CHAR *t )
                                        {
                                                if( *t >= range_start && *t <= range_end )
                                                {
-                                                       member_match = TRUE;
-                                                       loop = FALSE;
+                                                       member_match = true;
+                                                       loop = false;
                                                }
                                        }
                                        else
                                        {
                                                if( *t >= range_end && *t <= range_start )
                                                {
-                                                       member_match = TRUE;
-                                                       loop = FALSE;
+                                                       member_match = true;
+                                                       loop = false;
                                                }
                                        }
                                }
@@ -200,10 +225,10 @@ Matche( REGISTER CHAR *p, REGISTER CHAR *t )
 } /* Matche */
 
 
-LOCAL INT
-Matche_After_Star( REGISTER CHAR *p, REGISTER CHAR *t )
+static int
+Matche_After_Star( const char *p, const char *t )
 {
-       REGISTER INT nextp, match = 0;
+       register int nextp, match = 0;
 
        /* pass over existing ? and * in pattern */
        while( *p == '?' || *p == '*' )