X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=b230ab147daf8245a1e62ad4858e56f6c21d4aa6;hb=985c2bd1e6ea0bba467143406b83ba4a9f77fce1;hp=eeb6190f2b7bf90dfffd70b15479a14e04276d28;hpb=bab14f0dd2345c9d7dcbc47c918563709e1ac094;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index eeb6190f2..b230ab147 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1 +1,174 @@
-/*       +------------------------------------+
 *       | Inspire Internet Relay Chat Daemon |
 *       +------------------------------------+
 *
 *  InspIRCd: (C) 2002-2007 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.
 *
 * ---------------------------------------------------
 */

#include "inspircd.h"
#include <string>
#include "hashcomp.h"
#include "inspstring.h"

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)
{
	unsigned char *cp = NULL, *mp = NULL;
	unsigned char* string = (unsigned char*)str;
	unsigned char* wild = (unsigned char*)mask;

	while ((*string) && (*wild != '*'))
	{
		if ((*wild != *string) && (*wild != '?'))
		{
			return 0;
		}
		wild++;
		string++;
	}

	while (*string)
	{
		if (*wild == '*')
		{
			if (!*++wild)
			{
				return 1;
			}
			mp = wild;
			cp = string+1;
		}
		else
		if ((*wild == *string) || (*wild == '?'))
		{
			wild++;
			string++;
		}
		else
		{
			wild = mp;
			string = cp++;
		}

	}

	while (*wild == '*')
	{
		wild++;
	}

	return !*wild;
}

CoreExport bool match(const char *str, const char *mask)
{
	unsigned char *cp = NULL, *mp = NULL;
	unsigned char* string = (unsigned char*)str;
	unsigned char* wild = (unsigned char*)mask;

	while ((*string) && (*wild != '*'))
	{
		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
		{
			return 0;
		}
		wild++;
		string++;
	}

	while (*string)
	{
		if (*wild == '*')
		{
			if (!*++wild)
			{
				return 1;
			}
			mp = wild;
			cp = string+1;
		}
		else
		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
		{
			wild++;
			string++;
		}
		else
		{
			wild = mp;
			string = cp++;
		}

	}

	while (*wild == '*')
	{
		wild++;
	}

	return !*wild;
}

/* Overloaded function that has the option of using cidr */
CoreExport bool match(const char *str, const char *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)
{
	if (use_cidr_match && MatchCIDR(str, mask, true))
		return true;
	return csmatch(str, mask);
}

CoreExport bool match(bool case_sensitive, const char *str, const char *mask)
{
	return case_sensitive ? csmatch(str, mask) : match(str, mask);
}

\ No newline at end of file
+/*       +------------------------------------+
+ *       | 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.
+ *
+ * ---------------------------------------------------
+ */
+
+/* $Core */
+
+#include "inspircd.h"
+#include "hashcomp.h"
+#include "inspstring.h"
+
+using irc::sockets::MatchCIDR;
+
+/* 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)
+{
+	std::string::const_iterator cp, mp;
+
+	//unsigned char *cp = NULL, *mp = NULL;
+	//unsigned char* string = (unsigned char*)str;
+	//unsigned char* wild = (unsigned char*)mask;
+
+	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 false;
+
+		wild++;
+		string++;
+	}
+
+	if (wild == mask.end() && string != str.end())
+		return false;
+
+	while (string != str.end())
+	{
+		if (wild != mask.end() && *wild == '*')
+		{
+			if (++wild == mask.end())
+				return true;
+
+			mp = wild;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
+		}
+		else
+		if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
+		{
+			wild++;
+			string++;
+		}
+		else
+		{
+			wild = mp;
+			if (cp == str.end())
+				cp = str.end();
+			else
+				string = cp++;
+		}
+
+	}
+
+	while ((wild != mask.end()) && (*wild == '*'))
+		wild++;
+
+	return wild == mask.end();
+}
+
+CoreExport bool match(const std::string &str, const std::string &mask)
+{
+	std::string::const_iterator cp, mp;
+	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 ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
+			return false;
+
+		wild++;
+		string++;
+		//printf("Iterate first loop\n");
+	}
+
+	if (wild == mask.end() && string != str.end())
+		return false;
+
+	while (string != str.end())
+	{
+		//printf("outer\n %c", *string);
+		if (wild != mask.end() && *wild == '*')
+		{
+
+			//printf("inner %c\n", *wild);
+			if (++wild == mask.end())
+				return true;
+
+			mp = wild;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
+
+		}
+		else
+		if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
+		{
+			if (wild != mask.end())
+				wild++;
+
+			if (string != str.end())
+				string++;
+		}
+		else
+		{
+			wild = mp;
+			if (cp == str.end())
+				string = str.end();
+			else
+				string = cp++;
+		}
+
+	}
+
+	while ((wild != mask.end()) && (*wild == '*'))
+		wild++;
+
+	return wild == mask.end();
+}
+
+/* Overloaded function that has the option of using cidr */
+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 std::string &str, const std::string &mask, bool use_cidr_match)
+{
+	if (use_cidr_match && MatchCIDR(str, mask, true))
+		return true;
+
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
+}
+
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
+{
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
+}
+