/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2018 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
GLOBAL bool
Match( const char *Pattern, const char *String )
{
- if( Matche( Pattern, String ) == MATCH_VALID ) return true;
- else return false;
+ if (Matche(Pattern, String) == MATCH_VALID)
+ return true;
+ else
+ return false;
} /* Match */
/**
GLOBAL bool
MatchCaseInsensitive(const char *Pattern, const char *String)
{
- char haystack[COMMAND_LEN];
+ char needle[COMMAND_LEN], haystack[COMMAND_LEN];
+ strlcpy(needle, Pattern, sizeof(needle));
strlcpy(haystack, String, sizeof(haystack));
- return Match(Pattern, ngt_LowerStr(haystack));
+
+ return Match(ngt_LowerStr(needle), ngt_LowerStr(haystack));
} /* MatchCaseInsensitive */
/**
* Match string with pattern case-insensitive.
*
- * @param pattern Pattern to match with
+ * @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
MatchCaseInsensitiveList(const char *Pattern, const char *String,
const char *Separator)
{
- char tmp_pattern[COMMAND_LEN], haystack[COMMAND_LEN], *ptr;
+ char tmp_pattern[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))
+ if (MatchCaseInsensitive(ptr, String))
return true;
ptr = strtok(NULL, Separator);
}