X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fmatch.c;h=bc26e75588d05c19e12ae719e8ae4179f35eb4ca;hp=2ba5bcae00001d260edc591dcba0383ee4453349;hb=e73d70ce6fab3acdefe914520a4296acb6d50eac;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e diff --git a/src/ngircd/match.c b/src/ngircd/match.c index 2ba5bcae..bc26e755 100644 --- a/src/ngircd/match.c +++ b/src/ngircd/match.c @@ -1,20 +1,20 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * 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 @@ -22,45 +22,93 @@ 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: - * + * 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": */ -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 String Input string, at most COMMAND_LEN-1 characters long + * @return true if pattern matches + */ +GLOBAL bool +MatchCaseInsensitive(const char *Pattern, const char *String) { - REGISTER CHAR range_start, range_end; - BOOLEAN invert; - BOOLEAN member_match; - BOOLEAN loop; + char haystack[COMMAND_LEN]; + + strlcpy(haystack, String, sizeof(haystack)); + return Match(Pattern, ngt_LowerStr(haystack)); +} /* MatchCaseInsensitive */ + +/** + * Match string with pattern case-insensitive. + * + * @param pattern Pattern to match with + * @param String Input string, at most COMMAND_LEN-1 characters long + * @param Separator Character separating the individual patterns in the list + * @return true if pattern matches + */ +GLOBAL bool +MatchCaseInsensitiveList(const char *Pattern, const char *String, + const char *Separator) +{ + char tmp_pattern[COMMAND_LEN], haystack[COMMAND_LEN], *ptr; + + strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern)); + strlcpy(haystack, String, sizeof(haystack)); + ngt_LowerStr(haystack); + + ptr = strtok(tmp_pattern, Separator); + while (ptr) { + ngt_TrimStr(ptr); + if (Match(ptr, haystack)) + return true; + ptr = strtok(NULL, Separator); + } + return false; +} /* MatchCaseInsensitive */ + + +static int +Matche( const char *p, const char *t ) +{ for( ; *p; p++, t++ ) { /* if this is the end of the text then this is the end of the match */ @@ -78,118 +126,7 @@ Matche( REGISTER CHAR *p, REGISTER CHAR *t ) case '*': /* multiple any character match */ return Matche_After_Star( p, t ); - case '[': /* [..] construct, single member/exclusion character match */ - /* move to beginning of range */ - p++; - - /* check if this is a member match or exclusion match */ - invert = FALSE; - if( *p == '!' || *p == '^' ) - { - 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; - - while( loop ) - { - /* if end of construct then loop is done */ - if( *p == ']' ) - { - loop = FALSE; - continue; - } - - /* matching a '!', '^', '-', '\' or a ']' */ - if( *p == '\\' ) range_start = range_end = *++p; - else range_start = range_end = *p; - - /* if end of pattern then bad pattern (Missing ']') */ - if( ! *p ) return MATCH_PATTERN; - - /* check for range bar */ - if( *++p == '-' ) - { - /* get the range end */ - range_end = *++p; - - /* if end of pattern or construct then bad pattern */ - if( range_end == '\0' || range_end == ']' ) return MATCH_PATTERN; - - /* special character range end */ - if( range_end == '\\' ) - { - range_end = *++p; - - /* if end of text then we have a bad pattern */ - if ( ! range_end ) return MATCH_PATTERN; - } - - /* move just beyond this range */ - p++; - } - - /* if the text character is in range then match found. make sure the range - * letters have the proper relationship to one another before comparison */ - if( range_start < range_end ) - { - if( *t >= range_start && *t <= range_end ) - { - member_match = TRUE; - loop = FALSE; - } - } - else - { - if( *t >= range_end && *t <= range_start ) - { - member_match = TRUE; - loop = FALSE; - } - } - } - - /* if there was a match in an exclusion set then no match */ - /* if there was no match in a member set then no match */ - if(( invert && member_match ) || ! ( invert || member_match )) return MATCH_RANGE; - - /* if this is not an exclusion then skip the rest of the [...] - * construct that already matched. */ - if( member_match ) - { - while( *p != ']' ) - { - /* bad pattern (Missing ']') */ - if( ! *p ) return MATCH_PATTERN; - - /* skip exact match */ - if( *p == '\\' ) - { - p++; - - /* if end of text then we have a bad pattern */ - if( ! *p ) return MATCH_PATTERN; - } - - /* move to next pattern char */ - p++; - } - } - break; - case '\\': /* next character is quoted and must match exactly */ - /* move pattern pointer to quoted char and fall through */ - p++; - - /* if end of text then we have a bad pattern */ - if( ! *p ) return MATCH_PATTERN; - - /* must match this character exactly */ - default: + default: /* must match this character exactly */ if( *p != *t ) return MATCH_LITERAL; } } @@ -200,10 +137,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 == '*' )