diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/inspircd.h | 23 | ||||
| -rw-r--r-- | include/wildcard.h | 43 |
2 files changed, 15 insertions, 51 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index 81a9f3cbe..85800f4da 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -712,14 +712,21 @@ class CoreExport InspIRCd : public classbase */ void SendMode(const std::vector<std::string>& parameters, User *user); - /** Match two strings using pattern matching. - * This operates identically to the global function match(), - * except for that it takes std::string arguments rather than - * const char* ones. - * @param sliteral The literal string to match against - * @param spattern The pattern to match against. CIDR and globs are supported. - */ - bool MatchText(const std::string &sliteral, const std::string &spattern); + /** Match two strings using pattern matching, optionally, with a map + * to check case against (may be NULL). + * @param str The literal string to match against + * @param mask The glob pattern to match against. + */ + static bool Match(const std::string &str, const std::string &mask, unsigned const char *map); + static bool Match(const char *str, const char *mask, unsigned const char *map); + + /** Match two strings using pattern matching, optionally, with a map + * to check case against (may be NULL). Supports CIDR patterns as well as globs. + * @param str The literal string to match against + * @param mask The glob or CIDR pattern to match against. + */ + static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map); + static bool MatchCIDR(const char *str, const char *mask, unsigned const char *map); /** Call the handler for a given command. * @param commandname The command whos handler you wish to call diff --git a/include/wildcard.h b/include/wildcard.h deleted file mode 100644 index 8c99b8dca..000000000 --- a/include/wildcard.h +++ /dev/null @@ -1,43 +0,0 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ - * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits - * - * This program is free but copyrighted software; see - * the file COPYING for details. - * - * --------------------------------------------------- - */ - -/** Match a string against a mask. - * @param str The string to check - * @param mask the mask to check against - * @return true if the strings match - */ -CoreExport bool match(const std::string &str, const std::string &mask); -/** Match a string against a mask, and define wether or not to use CIDR rules - * @param str The string to check - * @param mask the mask to check against - * @param use_cidr_match True if CIDR matching rules should be applied first - * @return true if the strings match - */ -CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match); -/** Match a string against a mask, defining wether case sensitivity applies. - * @param str The string to check - * @param mask the mask to check against - * @param case_sensitive True if the match is case sensitive - * @return True if the strings match - */ -CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask); -/** Match a string against a mask, defining wether case sensitivity applies, - * and defining wether or not to use CIDR rules first. - * @param case_sensitive True if the match is case sensitive - * @param str The string to check - * @param mask the mask to check against - * @param use_cidr_match True if CIDR matching rules should be applied first - * @return true if the strings match - */ -CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match); - |