X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fmatch.c;h=5e97e71fc15e5476b2f7935b75d2a0d4ebc35330;hb=5e82a91d1337b78510bc62fe3c7e43f9c0b7d3d1;hp=ff5807723a83b24ca542e655184e6a5dc508c731;hpb=8adff5922376676c2eeb49de1cbab86cc345b887;p=ngircd-alex.git diff --git a/src/ngircd/match.c b/src/ngircd/match.c index ff580772..5e97e71f 100644 --- a/src/ngircd/match.c +++ b/src/ngircd/match.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: match.c,v 1.3 2005/03/19 18:43:49 fw Exp $"; +static char UNUSED id[] = "$Id: match.c,v 1.5 2006/10/06 21:23:47 fw Exp $"; #include "imp.h" #include @@ -22,6 +22,8 @@ static char UNUSED id[] = "$Id: match.c,v 1.3 2005/03/19 18:43:49 fw Exp $"; #include "exp.h" #include "match.h" +#include "defines.h" +#include "tool.h" /* @@ -32,8 +34,8 @@ static char UNUSED id[] = "$Id: match.c,v 1.3 2005/03/19 18:43:49 fw Exp $"; */ -LOCAL int Matche PARAMS(( char *p, char *t )); -LOCAL int Matche_After_Star PARAMS(( char *p, 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 */ @@ -45,7 +47,7 @@ LOCAL int Matche_After_Star PARAMS(( char *p, char *t )); GLOBAL bool -Match( char *Pattern, char *String ) +Match( const char *Pattern, const char *String ) { /* Pattern mit String vergleichen */ if( Matche( Pattern, String ) == MATCH_VALID ) return true; @@ -53,8 +55,18 @@ Match( char *Pattern, char *String ) } /* Match */ -LOCAL int -Matche( char *p, char *t ) +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; bool invert; @@ -200,8 +212,8 @@ Matche( char *p, char *t ) } /* Matche */ -LOCAL int -Matche_After_Star( char *p, char *t ) +static int +Matche_After_Star( const char *p, const char *t ) { register int nextp, match = 0;