diff options
| -rw-r--r-- | include/hashcomp.h | 56 | ||||
| -rw-r--r-- | src/hashcomp.cpp | 84 | ||||
| -rw-r--r-- | src/modules/m_censor.cpp | 19 |
3 files changed, 49 insertions, 110 deletions
diff --git a/include/hashcomp.h b/include/hashcomp.h index 1dd1b3b98..bda85182f 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -77,6 +77,13 @@ namespace irc */ CoreExport bool equals(const std::string& s1, const std::string& s2); + /** Check whether \p needle exists within \p haystack. + * @param haystack The string to search within. + * @param needle The string to search for. + * @return Either the index at which \p needle was found or std::string::npos. + */ + CoreExport size_t find(const std::string& haystack, const std::string& needle); + /** This class returns true if two strings match. * Case sensitivity is ignored, and the RFC 'character set' * is adhered to @@ -101,55 +108,6 @@ namespace irc bool CoreExport operator()(const std::string& a, const std::string& b) const; }; - /** The irc_char_traits class is used for RFC-style comparison of strings. - * This class is used to implement irc::string, a case-insensitive, RFC- - * comparing string class. - */ - struct CoreExport irc_char_traits : public std::char_traits<char> - { - /** Check if two chars match. - * @param c1st First character - * @param c2nd Second character - * @return true if the characters are equal - */ - static bool eq(char c1st, char c2nd); - - /** Check if two chars do NOT match. - * @param c1st First character - * @param c2nd Second character - * @return true if the characters are unequal - */ - static bool ne(char c1st, char c2nd); - - /** Check if one char is less than another. - * @param c1st First character - * @param c2nd Second character - * @return true if c1st is less than c2nd - */ - static bool lt(char c1st, char c2nd); - - /** Compare two strings of size n. - * @param str1 First string - * @param str2 Second string - * @param n Length to compare to - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ - static int compare(const char* str1, const char* str2, size_t n); - - /** Find a char within a string up to position n. - * @param s1 String to find in - * @param n Position to search up to - * @param c Character to search for - * @return Pointer to the first occurance of c in s1 - */ - static const char* find(const char* s1, int n, char c); - }; - - /** This typedef declares irc::string based upon irc_char_traits. - */ - typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string; - /** Joins the contents of a vector to a string. * @param sequence Zero or more items to join. * @param separator The character to place between the items, defaults to ' ' (space). diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index aa06759a4..08ce154e8 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -128,6 +128,38 @@ bool irc::equals(const std::string& s1, const std::string& s2) return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]); } +size_t irc::find(const std::string& haystack, const std::string& needle) +{ + // The haystack can't contain the needle if it is smaller than it. + if (needle.length() > haystack.length()) + return std::string::npos; + + // The inner loop checks the characters between haystack_last and the end of the haystack. + size_t haystack_last = haystack.length() - needle.length(); + for (size_t hpos = 0; hpos <= haystack_last; ++hpos) + { + // Check for the needle at the current haystack position. + bool found = true; + for (size_t npos = 0; npos < needle.length(); ++npos) + { + if (national_case_insensitive_map[(unsigned char)needle[npos]] != national_case_insensitive_map[(unsigned char)haystack[hpos + npos]]) + { + // Uh-oh, characters at the current haystack position don't match. + found = false; + break; + } + } + + // The entire needle was found in the haystack! + if (found) + return hpos; + } + + // We didn't find anything. + return std::string::npos; +} + + bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const { const unsigned char* charmap = national_case_insensitive_map; @@ -161,58 +193,6 @@ size_t irc::insensitive::operator()(const std::string &s) const return t; } -/****************************************************** - * - * This is the implementation of our special irc::string - * class which is a case-insensitive equivalent to - * std::string which is not only case-insensitive but - * can also do scandanavian comparisons, e.g. { = [, etc. - * - * This class depends on the const array 'national_case_insensitive_map'. - * - ******************************************************/ - -bool irc::irc_char_traits::eq(char c1st, char c2nd) -{ - return national_case_insensitive_map[(unsigned char)c1st] == national_case_insensitive_map[(unsigned char)c2nd]; -} - -bool irc::irc_char_traits::ne(char c1st, char c2nd) -{ - return national_case_insensitive_map[(unsigned char)c1st] != national_case_insensitive_map[(unsigned char)c2nd]; -} - -bool irc::irc_char_traits::lt(char c1st, char c2nd) -{ - return national_case_insensitive_map[(unsigned char)c1st] < national_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(national_case_insensitive_map[(unsigned char)*str1] > national_case_insensitive_map[(unsigned char)*str2]) - return 1; - - if(national_case_insensitive_map[(unsigned char)*str1] < national_case_insensitive_map[(unsigned char)*str2]) - return -1; - - if(*str1 == 0 || *str2 == 0) - return 0; - - str1++; - str2++; - } - return 0; -} - -const char* irc::irc_char_traits::find(const char* s1, int n, char c) -{ - while(n-- > 0 && national_case_insensitive_map[(unsigned char)*s1] != national_case_insensitive_map[(unsigned char)c]) - s1++; - return (n >= 0) ? s1 : NULL; -} - irc::tokenstream::tokenstream(const std::string &source) : spacesepstream(source) { } diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index fce00dfc7..cb2bec85a 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -23,7 +23,7 @@ #include "inspircd.h" #include "modules/exemption.h" -typedef insp::flat_map<irc::string, irc::string> censor_t; +typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> censor_t; class ModuleCensor : public Module { @@ -63,10 +63,10 @@ class ModuleCensor : public Module if (!active) return MOD_RES_PASSTHRU; - irc::string text2 = details.text.c_str(); for (censor_t::iterator index = censors.begin(); index != censors.end(); index++) { - if (text2.find(index->first) != irc::string::npos) + size_t censorpos; + while ((censorpos = irc::find(details.text, index->first)) != std::string::npos) { if (index->second.empty()) { @@ -75,10 +75,9 @@ class ModuleCensor : public Module return MOD_RES_DENY; } - stdalgo::string::replace_all(text2, index->first, index->second); + details.text.replace(censorpos, index->first.size(), index->second); } } - details.text = text2.c_str(); return MOD_RES_PASSTHRU; } @@ -94,10 +93,12 @@ class ModuleCensor : public Module for (ConfigIter i = badwords.first; i != badwords.second; ++i) { ConfigTag* tag = i->second; - std::string str = tag->getString("text"); - irc::string pattern(str.c_str()); - str = tag->getString("replace"); - censors[pattern] = irc::string(str.c_str()); + const std::string text = tag->getString("text"); + if (text.empty()) + continue; + + const std::string replace = tag->getString("replace"); + censors[text] = replace; } } |