Stability fix

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index c5725a0bde6dd77916b0eee6d90bf82bcb13c458..34f53ea288f9114a1026d41dedb18210e997a242 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -21,17 +21,9 @@ using namespace std;
 #include <string>
 #include "hashcomp.h"
 #include "helperfuncs.h"
-#ifdef GCC3
 #include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 
-#ifdef GCC3
 #define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
 
 // from helperfuncs.cpp
 extern const char lowermap[255];
@@ -69,30 +61,33 @@ using namespace std;
 
 size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
 {
-        size_t q;
-        memcpy(&q,&a,sizeof(size_t));
-        return q;
+       size_t q;
+       memcpy(&q,&a,sizeof(size_t));
+       return q;
 }
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-        char a[MAXBUF];
-        static struct hash<const char *> strhash;
-        strlcpy(a,s.c_str(),MAXBUF);
-        strlower(a);
-        return strhash(a);
+       char a[MAXBUF];
+       static struct hash<const char *> strhash;
+       strlcpy(a,s.c_str(),MAXBUF);
+       strlower(a);
+       return strhash(a);
 }
 
 bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
 {
-       irc::string a = s1.c_str();
-       irc::string b = s2.c_str();
-        return (a == b);
+       unsigned char* n1 = (unsigned char*)s1.c_str();
+       unsigned char* n2 = (unsigned char*)s2.c_str();
+       for (; *n1 && *n2; n1++, n2++)
+               if (lowermap[*n1] != lowermap[*n2])
+                       return false;
+       return (lowermap[*n1] == lowermap[*n2]);
 }
 
 bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 {
-        return (s1.s_addr == s1.s_addr);
+       return (s1.s_addr == s1.s_addr);
 }
 
 /******************************************************
@@ -110,31 +105,31 @@ bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) cons
 
 bool irc::irc_char_traits::eq(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::ne(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::lt(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd];
 }
 
 int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 {
        for(unsigned int i = 0; i < n; i++)
        {
-               if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
-                               return 1;
+               if(lowermap[(unsigned char)*str1] > lowermap[(unsigned char)*str2])
+                               return 1;
 
-               if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
-                       return -1;
+               if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2])
+                       return -1;
 
-               if(*str1 == 0 || *str2 == 0)
-                       return 0;
+               if(*str1 == 0 || *str2 == 0)
+                       return 0;
 
                str1++;
                str2++;
@@ -142,29 +137,29 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
        return 0;
 }
 
-std::string& operator+ (std::string& leftval, irc::string& rightval)
+std::string operator+ (std::string& leftval, irc::string& rightval)
 {
        return leftval + std::string(rightval.c_str());
 }
 
-irc::string& operator+ (irc::string& leftval, std::string& rightval)
+irc::string operator+ (irc::string& leftval, std::string& rightval)
 {
        return leftval + irc::string(rightval.c_str());
 }
 
-std::string& operator== (std::string& leftval, irc::string& rightval)
+bool operator== (std::string& leftval, irc::string& rightval)
 {
        return (leftval == std::string(rightval.c_str()));
 }
 
-irc::string& operator== (irc::string& leftval, std::string& rightval)
+bool operator== (irc::string& leftval, std::string& rightval)
 {
-       return (rightval == irc::string(leftval.c_str()));
+       return (rightval == std::string(leftval.c_str()));
 }
 
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
-       while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
+       while(n-- > 0 && lowermap[(unsigned char)*s1] != lowermap[(unsigned char)c])
                s1++;
        return s1;
 }
@@ -182,3 +177,73 @@ std::istream& operator>>(std::istream &is, irc::string &str)
        str = tmp.c_str();
        return is;
 }
+
+irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
+{
+       last_starting_position = tokens.begin();
+       n = tokens.begin();
+}
+
+irc::tokenstream::~tokenstream()
+{
+}
+
+const std::string irc::tokenstream::GetToken()
+{
+       std::string::iterator lsp = last_starting_position;
+
+       while (n != tokens.end())
+       {
+               if ((last_pushed) && (*n == ':'))
+               {
+                       /* If we find a token thats not the first and starts with :,
+                        * this is the last token on the line
+                        */
+                       std::string::iterator curr = ++n;
+                       n = tokens.end();
+                       return std::string(curr, tokens.end());
+               }
+
+               last_pushed = false;
+
+               if ((*n == ' ') || (n+1 == tokens.end()))
+               {
+                       /* If we find a space, or end of string, this is the end of a token.
+                        */
+                       last_starting_position = n+1;
+                       last_pushed = true;
+                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+               }
+
+               n++;
+       }
+       return "";
+}
+
+irc::commasepstream::commasepstream(const std::string &source) : tokens(source)
+{
+       last_starting_position = tokens.begin();
+       n = tokens.begin();
+}
+
+const std::string irc::commasepstream::GetToken()
+{
+       std::string::iterator lsp = last_starting_position;
+
+       while (n != tokens.end())
+       {
+               if ((*n == ',') || (n+1 == tokens.end()))
+               {
+                       last_starting_position = n+1;
+                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+               }
+
+               n++;
+       }
+
+       return "";
+}
+
+irc::commasepstream::~commasepstream()
+{
+}