X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=2df7a5bec10e769b3e3445e8ebc18132fbfaee0c;hb=e078fae142238765f279b50c309f22a5a0761ce4;hp=4344219644b9b48beff94c2c57928cd415676135;hpb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 434421964..2df7a5bec 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,45 +19,49 @@
 
 using irc::sockets::MatchCIDR;
 
-// Wed 27 Apr 2005 - Brain
-// I've taken our our old wildcard routine -
-// although comprehensive, it was topheavy and very
-// slow, and ate masses of cpu when doing lots of
-// comparisons. This is the 'de-facto' routine used
-// by many, nobody really knows who wrote it first
-// or what license its under, i've seen examples of it
-// (unattributed to any author) all over the 'net.
-// For now, we'll just consider this public domain.
-
-CoreExport bool csmatch(const char *str, const char *mask)
+/* Rewritten to operate on more effective C++ std::string types
+ * rather than char* to avoid data copies.
+ * - Brain
+ */
+
+CoreExport bool csmatch(const std::string &str, const std::string &mask)
 {
-	unsigned char *cp = NULL, *mp = NULL;
-	unsigned char* string = (unsigned char*)str;
-	unsigned char* wild = (unsigned char*)mask;
+	std::string::const_iterator cp, mp;
+
+	//unsigned char *cp = NULL, *mp = NULL;
+	//unsigned char* string = (unsigned char*)str;
+	//unsigned char* wild = (unsigned char*)mask;
 
-	while ((*string) && (*wild != '*'))
+	std::string::const_iterator wild = mask.begin();
+	std::string::const_iterator string = str.begin();
+
+	if (mask.empty())
+		return false;
+
+	while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
 	{
 		if ((*wild != *string) && (*wild != '?'))
-		{
 			return 0;
-		}
+
 		wild++;
 		string++;
 	}
 
-	while (*string)
+	while (string != str.end())
 	{
-		if (*wild == '*')
+		if (wild != mask.end() && *wild == '*')
 		{
-			if (!*++wild)
-			{
+			if (++wild == mask.end())
 				return 1;
-			}
+
 			mp = wild;
-			cp = string+1;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
 		}
 		else
-		if ((*wild == *string) || (*wild == '?'))
+		if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
 		{
 			wild++;
 			string++;
@@ -65,48 +69,54 @@ CoreExport bool csmatch(const char *str, const char *mask)
 		else
 		{
 			wild = mp;
-			string = cp++;
+			if (cp == str.end())
+				cp = str.end();
+			else
+				string = cp++;
 		}
 
 	}
 
-	while (*wild == '*')
-	{
+	while ((wild != mask.end()) && (*wild == '*'))
 		wild++;
-	}
 
-	return !*wild;
+	return wild == mask.end();
 }
 
-CoreExport bool match(const char *str, const char *mask)
+CoreExport bool match(const std::string &str, const std::string &mask)
 {
-	unsigned char *cp = NULL, *mp = NULL;
-	unsigned char* string = (unsigned char*)str;
-	unsigned char* wild = (unsigned char*)mask;
+	std::string::const_iterator cp, mp;
+	std::string::const_iterator wild = mask.begin();
+	std::string::const_iterator string = str.begin();
 
-	while ((*string) && (*wild != '*'))
+	if (mask.empty())
+		return false;
+
+	while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
 	{
-		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
-		{
+		if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
 			return 0;
-		}
+
 		wild++;
 		string++;
 	}
 
-	while (*string)
+	while (string != str.end())
 	{
-		if (*wild == '*')
+		if (wild != mask.end() && *wild == '*')
 		{
-			if (!*++wild)
-			{
+			if (++wild == mask.end())
 				return 1;
-			}
+
 			mp = wild;
-			cp = string+1;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
+
 		}
 		else
-		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
+		if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
 		{
 			wild++;
 			string++;
@@ -114,35 +124,37 @@ CoreExport bool match(const char *str, const char *mask)
 		else
 		{
 			wild = mp;
-			string = cp++;
+			if (cp == str.end())
+				string = str.end();
+			else
+				string = cp++;
 		}
 
 	}
 
-	while (*wild == '*')
-	{
+	while ((wild != mask.end()) && (*wild == '*'))
 		wild++;
-	}
 
-	return !*wild;
+	return wild == mask.end();
 }
 
 /* Overloaded function that has the option of using cidr */
-CoreExport bool match(const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match)
 {
 	if (use_cidr_match && MatchCIDR(str, mask, true))
 		return true;
 	return match(str, mask);
 }
 
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match)
 {
 	if (use_cidr_match && MatchCIDR(str, mask, true))
 		return true;
-	return csmatch(str, mask);
+
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }
 
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask)
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
 {
 	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }