Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 4d8d94eb42e3c0633f3f35d29e60b64d03a4a55d..eb9151293d8e185747de8ba4a3caaa729a5b1588 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,46 +1,44 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* $Core */
 
 #include "inspircd.h"
 #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 +47,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 +71,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 +110,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);
 }