X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=a9a3441b9e80b5180b5ae07ed5c9fcdd41582de6;hb=9183ebd28c79b12ddf29b3847f59679e480af70a;hp=3ab91531fa0b03dcbdf32e57a17c668e53bdd0b6;hpb=badadc427a99e5483402c21bf5b7ae64722930e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 3ab91531f..a9a3441b9 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.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 @@ -11,16 +11,11 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" #include "hashcomp.h" -#ifndef WIN32 -#include -#define nspace __gnu_cxx -#else -#include -#define nspace stdext -using stdext::hash_map; -#endif +#include "hash_map.h" /****************************************************** * @@ -47,8 +42,6 @@ using stdext::hash_map; * ******************************************************/ -using namespace irc::sockets; - /* convert a string to lowercase. Note following special circumstances * taken from RFC 1459. Many "official" server branches still hold to this * rule so i will too; @@ -63,28 +56,33 @@ void nspace::strlower(char *n) if (n) { for (char* t = n; *t; t++) - *t = lowermap[(unsigned char)*t]; + *t = rfc_case_insensitive_map[(unsigned char)*t]; } } #ifndef WIN32 -size_t nspace::hash::operator()(const string &s) const + #ifdef HASHMAP_DEPRECATED + size_t nspace::insensitive::operator()(const std::string &s) const + #else + size_t nspace::hash::operator()(const std::string &s) const + #endif #else -size_t nspace::hash_compare >::operator()(const string &s) const + size_t nspace::hash_compare >::operator()(const std::string &s) const #endif { /* XXX: NO DATA COPIES! :) * The hash function here is practically * a copy of the one in STL's hash_fun.h, - * only with *x replaced with lowermap[*x]. + * only with *x replaced with rfc_case_insensitive_map[*x]. * This avoids a copy to use hash */ register size_t t = 0; for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ - t = 5 * t + lowermap[(unsigned char)*x]; + t = 5 * t + rfc_case_insensitive_map[(unsigned char)*x]; return t; } + #ifndef WIN32 size_t nspace::hash::operator()(const irc::string &s) const #else @@ -93,18 +91,18 @@ size_t nspace::hash_compare >::operator()(co { register size_t t = 0; for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ - t = 5 * t + lowermap[(unsigned char)*x]; + t = 5 * t + rfc_case_insensitive_map[(unsigned char)*x]; return t; } bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const { - unsigned char* n1 = (unsigned char*)s1.c_str(); - unsigned char* n2 = (unsigned char*)s2.c_str(); + const unsigned char* n1 = (const unsigned char*)s1.c_str(); + const unsigned char* n2 = (const unsigned char*)s2.c_str(); for (; *n1 && *n2; n1++, n2++) - if (lowermap[*n1] != lowermap[*n2]) + if (rfc_case_insensitive_map[*n1] != rfc_case_insensitive_map[*n2]) return false; - return (lowermap[*n1] == lowermap[*n2]); + return (rfc_case_insensitive_map[*n1] == rfc_case_insensitive_map[*n2]); } /****************************************************** @@ -114,33 +112,33 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) * std::string which is not only case-insensitive but * can also do scandanavian comparisons, e.g. { = [, etc. * - * This class depends on the const array 'lowermap'. + * This class depends on the const array 'rfc_case_insensitive_map'. * ******************************************************/ bool irc::irc_char_traits::eq(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] == rfc_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::ne(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] != rfc_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::lt(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd]; + return rfc_case_insensitive_map[(unsigned char)c1st] < rfc_case_insensitive_map[(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 char)*str1] > lowermap[(unsigned char)*str2]) + if(rfc_case_insensitive_map[(unsigned char)*str1] > rfc_case_insensitive_map[(unsigned char)*str2]) return 1; - if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2]) + if(rfc_case_insensitive_map[(unsigned char)*str1] < rfc_case_insensitive_map[(unsigned char)*str2]) return -1; if(*str1 == 0 || *str2 == 0) @@ -154,7 +152,7 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n) const char* irc::irc_char_traits::find(const char* s1, int n, char c) { - while(n-- > 0 && lowermap[(unsigned char)*s1] != lowermap[(unsigned char)c]) + while(n-- > 0 && rfc_case_insensitive_map[(unsigned char)*s1] != rfc_case_insensitive_map[(unsigned char)c]) s1++; return s1; } @@ -211,17 +209,41 @@ bool irc::tokenstream::GetToken(std::string &token) n++; } - token = ""; + token.clear(); return false; } +bool irc::tokenstream::GetToken(irc::string &token) +{ + std::string stdstring; + bool returnval = GetToken(stdstring); + token = assign(stdstring); + return returnval; +} + +bool irc::tokenstream::GetToken(int &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; +} + +bool irc::tokenstream::GetToken(long &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; +} + irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator) { last_starting_position = tokens.begin(); n = tokens.begin(); } -const std::string irc::sepstream::GetToken() +bool irc::sepstream::GetToken(std::string &token) { std::string::iterator lsp = last_starting_position; @@ -230,18 +252,22 @@ const std::string irc::sepstream::GetToken() if ((*n == sep) || (n+1 == tokens.end())) { last_starting_position = n+1; - std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1 : n++); + token = std::string(lsp, n+1 == tokens.end() ? n+1 : n++); - while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1)) - strip.erase(strip.end() - 1); + while ((token.length()) && (token.find_last_of(sep) == token.length() - 1)) + token.erase(token.end() - 1); + + if (token.empty()) + n++; - return strip; + return n == tokens.end() ? false : true; } n++; } - return ""; + token = ""; + return false; } const std::string irc::sepstream::GetRemaining() @@ -266,19 +292,17 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz) /* EWW! This used to be using sprintf, which is WAY inefficient. -Special */ const char *hex = "0123456789abcdef"; - - std::string buf; - buf.reserve(rawsz * 2 + 1); + static char hexbuf[MAXBUF]; size_t i, j; for (i = 0, j = 0; j < rawsz; ++j) { - buf[i++] = hex[raw[j] / 16]; - buf[i++] = hex[raw[j] % 16]; + hexbuf[i++] = hex[raw[j] / 16]; + hexbuf[i++] = hex[raw[j] % 16]; } - buf[i] = '\0'; + hexbuf[i] = 0; - return buf; + return hexbuf; } CoreExport const char* irc::Spacify(const char* n) @@ -292,7 +316,7 @@ CoreExport const char* irc::Spacify(const char* n) } -irc::modestacker::modestacker(bool add) : adding(add) +irc::modestacker::modestacker(InspIRCd* Instance, bool add) : ServerInstance(Instance), adding(add) { sequence.clear(); sequence.push_back(""); @@ -336,7 +360,7 @@ int irc::modestacker::GetStackedLine(std::deque &result, int max_li if (sequence.size() > 1) nextsize = sequence[1].length() + 2; - while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1) && ((size + nextsize) < max_line_size)) + while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size)) { result[0] += *(sequence[0].begin()); if (!sequence[1].empty()) @@ -358,6 +382,9 @@ int irc::modestacker::GetStackedLine(std::deque &result, int max_li irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); @@ -365,13 +392,19 @@ irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector< irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); } -irc::stringjoiner::stringjoiner(const std::string &seperator, const char** sequence, int begin, int end) +irc::stringjoiner::stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); @@ -431,16 +464,15 @@ long irc::portparser::GetToken() in_range = 0; } - std::string x = sep->GetToken(); + std::string x; + sep->GetToken(x); - if (x == "") + if (x.empty()) return 0; while (Overlaps(atoi(x.c_str()))) { - x = sep->GetToken(); - - if (x == "") + if (!sep->GetToken(x)) return 0; }