albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New function MatchCaseInsensitiveList() to check list of patterns

This commit is contained in:
Alexander Barton 2012-08-26 13:11:45 +02:00
parent a6dd2e33c2
commit ab1fcebeff
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/ngircd/match.c
View File

@ -1,6 +1,6 @@
/*
* 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
@ -48,9 +48,9 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t ));
/**
* Match string with pattern.
*
* @param Pattern Pattern to match with
* @param String Input string
* @return true if pattern matches
* @param Pattern Pattern to match with
* @param String Input string
* @return true if pattern matches
*/
GLOBAL bool
Match( const char *Pattern, const char *String )
@ -64,17 +64,46 @@ Match( const char *Pattern, const char *String )
/**
* 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
* @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 *searchme)
MatchCaseInsensitive(const char *Pattern, const char *String)
{
char haystack[COMMAND_LEN];
strlcpy(haystack, searchme, sizeof(haystack));
return Match(pattern, ngt_LowerStr(haystack));
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 */

12
src/ngircd/match.h
View File

@ -1,6 +1,6 @@
/*
* 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
@ -17,8 +17,14 @@
* Wildcard pattern matching (header)
*/
GLOBAL bool Match PARAMS(( const char *Pattern, const char *String ));
GLOBAL bool MatchCaseInsensitive PARAMS(( const char *Pattern, const char *searchme ));
GLOBAL bool Match PARAMS((const char *Pattern, const char *String));
GLOBAL bool MatchCaseInsensitive PARAMS((const char *Pattern,
const char *String));
GLOBAL bool MatchCaseInsensitiveList PARAMS((const char *Pattern,
const char *String,
const char *Separator));
#endif