X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=00ccac2a87dced7615f94574b354b64e8202a4cf;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=4d8d94eb42e3c0633f3f35d29e60b64d03a4a55d;hpb=d92d9afa8d05d88da5f4fd08f0032eded83334e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 4d8d94eb4..00ccac2a8 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,30 +17,20 @@
 #include "hashcomp.h"
 #include "inspstring.h"
 
-#include <iostream>
-/*
- * Wildcard matching, the third (and probably final) iteration!
- *
- */
-static bool match_internal(const unsigned char *mask, const unsigned char *str, unsigned const char *map)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-	const unsigned char *wild = str;
-	const unsigned char *string = mask;
-	const unsigned char *cp = NULL;
-	const unsigned char *mp = NULL;
-
-	if (!map)
-		map = lowermap; // default to case insensitive search
+	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
 
 	while ((*string) && (*wild != '*'))
 	{
-		if (map[*wild] != map[*string] && (*wild != '?'))
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
 		{
-			return false;
+			return 0;
 		}
-
-		++wild;
-		++string;
+		wild++;
+		string++;
 	}
 
 	while (*string)
@@ -49,24 +39,23 @@ static bool match_internal(const unsigned char *mask, const unsigned char *str,
 		{
 			if (!*++wild)
 			{
-				return true;
+				return 1;
 			}
-
 			mp = wild;
 			cp = string+1;
 		}
-
-		// if mapped char == mapped wild AND wild is NOT ?
-		else if (map[*wild] == map[*string] && (*wild == '?'))
-		{
-			++wild;
-			++string;
-		}
 		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
+
 	}
 
 	while (*wild == '*')
@@ -74,31 +63,38 @@ static bool match_internal(const unsigned char *mask, const unsigned char *str,
 		wild++;
 	}
 
-	if (*wild == 0)
-		std::cout << "*wild == 0\n";
-	else
-		std::cout << "*wild != 0\n";
-	return (*wild == 0);
+	return !*wild;
 }
 
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
 CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
+	if (!map)
+		map = national_case_insensitive_map;
+
 	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
 }
 
 CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
 {
+	if (!map)
+		map = national_case_insensitive_map;
 	return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
-
 CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
+	if (!map)
+		map = national_case_insensitive_map;
+
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }
 
 CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
@@ -106,7 +102,10 @@ CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
+	if (!map)
+		map = national_case_insensitive_map;
+
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }