summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/example.conf14
-rw-r--r--include/anope.h32
-rw-r--r--include/config.h3
-rw-r--r--include/hashcomp.h259
-rw-r--r--src/config.cpp18
-rw-r--r--src/hashcomp.cpp92
6 files changed, 98 insertions, 320 deletions
diff --git a/data/example.conf b/data/example.conf
index 3b8fc6628..3a9022d47 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -277,6 +277,20 @@ networkinfo
options
{
/*
+ * The case mapping used by services. This must be set to a valid locale name
+ * installed on your machine. Services use this case map to compare, with
+ * case insensitivity, things such as nick names, channel names, etc.
+ *
+ * We provide two special casemaps shipped with Anope, ascii and rfc1459.
+ *
+ * This value should be set to what your IRCd uses, which is probably rfc1459,
+ * however Anope has always used ascii for comparison, so the default is ascii.
+ *
+ * Changing this value once set is not recommended.
+ */
+ casemap = "ascii"
+
+ /*
* The maximum length of passwords
*/
passlen = 32
diff --git a/include/anope.h b/include/anope.h
index a5056d50c..88c7eab98 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -28,7 +28,7 @@ namespace Anope
private:
/**
* The actual string is stored in an std::string as it can be converted to
- * ci::string, irc::string, or a C-style string at any time.
+ * ci::string, or a C-style string at any time.
*/
std::string _string;
public:
@@ -51,7 +51,6 @@ namespace Anope
string(const char *_str) : _string(_str) { }
string(const std::string &_str) : _string(_str) { }
string(const ci::string &_str) : _string(_str.c_str()) { }
- string(const irc::string &_str) : _string(_str.c_str()) { }
string(const string &_str, size_type pos = 0, size_type n = npos) : _string(_str._string, pos, n) { }
template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
@@ -61,8 +60,6 @@ namespace Anope
inline string &operator=(char chr) { this->_string = chr; return *this; }
inline string &operator=(const char *_str) { this->_string = _str; return *this; }
inline string &operator=(const std::string &_str) { this->_string = _str; return *this; }
- inline string &operator=(const ci::string &_str) { this->_string = _str.c_str(); return *this; }
- inline string &operator=(const irc::string &_str) { this->_string = _str.c_str(); return *this; }
inline string &operator=(const string &_str) { if (this != &_str) this->_string = _str._string; return *this; }
/**
@@ -70,35 +67,21 @@ namespace Anope
*/
inline bool operator==(const char *_str) const { return this->_string == _str; }
inline bool operator==(const std::string &_str) const { return this->_string == _str; }
- inline bool operator==(const ci::string &_str) const { return ci::string(this->_string.c_str()) == _str; }
- inline bool operator==(const irc::string &_str) const { return irc::string(this->_string.c_str()) == _str; }
inline bool operator==(const string &_str) const { return this->_string == _str._string; }
inline bool equals_cs(const char *_str) const { return this->_string == _str; }
inline bool equals_cs(const std::string &_str) const { return this->_string == _str; }
- inline bool equals_cs(const ci::string &_str) const { return this->_string == _str.c_str(); }
- inline bool equals_cs(const irc::string &_str) const { return this->_string == _str.c_str(); }
inline bool equals_cs(const string &_str) const { return this->_string == _str._string; }
inline bool equals_ci(const char *_str) const { return ci::string(this->_string.c_str()) == _str; }
inline bool equals_ci(const std::string &_str) const { return ci::string(this->_string.c_str()) == _str.c_str(); }
- inline bool equals_ci(const ci::string &_str) const { return _str == this->_string.c_str(); }
- inline bool equals_ci(const irc::string &_str) const { return ci::string(this->_string.c_str()) == _str.c_str(); }
inline bool equals_ci(const string &_str) const { return ci::string(this->_string.c_str()) == _str._string.c_str(); }
- inline bool equals_irc(const char *_str) const { return irc::string(this->_string.c_str()) == _str; }
- inline bool equals_irc(const std::string &_str) const { return irc::string(this->_string.c_str()) == _str.c_str(); }
- inline bool equals_irc(const ci::string &_str) const { return irc::string(this->_string.c_str()) == _str.c_str(); }
- inline bool equals_irc(const irc::string &_str) const { return _str == this->_string.c_str(); }
- inline bool equals_irc(const string &_str) const { return irc::string(this->_string.c_str()) == _str._string.c_str(); }
-
/**
* Inequality operators, exact opposites of the above.
*/
inline bool operator!=(const char *_str) const { return !operator==(_str); }
inline bool operator!=(const std::string &_str) const { return !operator==(_str); }
- inline bool operator!=(const ci::string &_str) const { return !operator==(_str); }
- inline bool operator!=(const irc::string &_str) const { return !operator==(_str); }
inline bool operator!=(const string &_str) const { return !operator==(_str); }
/**
@@ -107,8 +90,6 @@ namespace Anope
inline string &operator+=(char chr) { this->_string += chr; return *this; }
inline string &operator+=(const char *_str) { this->_string += _str; return *this; }
inline string &operator+=(const std::string &_str) { this->_string += _str; return *this; }
- inline string &operator+=(const ci::string &_str) { this->_string += _str.c_str(); return *this; }
- inline string &operator+=(const irc::string &_str) { this->_string += _str.c_str(); return *this; }
inline string &operator+=(const string &_str) { if (this != &_str) this->_string += _str._string; return *this; }
/**
@@ -117,15 +98,11 @@ namespace Anope
inline const string operator+(char chr) const { return string(*this) += chr; }
inline const string operator+(const char *_str) const { return string(*this) += _str; }
inline const string operator+(const std::string &_str) const { return string(*this) += _str; }
- inline const string operator+(const ci::string &_str) const { return string(*this) += _str; }
- inline const string operator+(const irc::string &_str) const { return string(*this) += _str; }
inline const string operator+(const string &_str) const { return string(*this) += _str; }
friend const string operator+(char chr, const string &str);
friend const string operator+(const char *_str, const string &str);
friend const string operator+(const std::string &_str, const string &str);
- friend const string operator+(const ci::string &_str, const string &str);
- friend const string operator+(const irc::string &_str, const string &str);
/**
* Less-than operator.
@@ -139,7 +116,6 @@ namespace Anope
inline std::string &str() { return this->_string; }
inline const std::string &str() const { return this->_string; }
inline ci::string ci_str() const { return ci::string(this->_string.c_str()); }
- inline irc::string irc_str() const { return irc::string(this->_string.c_str()); }
/**
* Returns if the string is empty or not.
@@ -260,7 +236,7 @@ namespace Anope
{
Anope::string new_string = *this;
for (size_type i = 0; i < new_string.length(); ++i)
- new_string[i] = static_cast<char>(tolower(new_string[i]));
+ new_string[i] = std::tolower(new_string[i], Anope::casemap);
return new_string;
}
@@ -271,7 +247,7 @@ namespace Anope
{
Anope::string new_string = *this;
for (size_type i = 0; i < new_string.length(); ++i)
- new_string[i] = static_cast<char>(toupper(new_string[i]));
+ new_string[i] = std::toupper(new_string[i], Anope::casemap);
return new_string;
}
@@ -325,8 +301,6 @@ namespace Anope
inline const string operator+(char chr, const string &str) { string tmp(chr); tmp += str; return tmp; }
inline const string operator+(const char *_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
inline const string operator+(const std::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
- inline const string operator+(const ci::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
- inline const string operator+(const irc::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
static const char *const compiled = __TIME__ " " __DATE__;
diff --git a/include/config.h b/include/config.h
index ac8c10fbd..9c6e9a143 100644
--- a/include/config.h
+++ b/include/config.h
@@ -392,6 +392,9 @@ class CoreExport ServerConfig
/* Max lenght of hostnames */
unsigned HostLen;
+ /* Casemapping to use */
+ Anope::string CaseMap;
+
/* Max length of passwords */
unsigned PassLen;
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 0a9df7139..f3621a52f 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -14,129 +14,56 @@
#define HASHCOMP_H
#include <string>
+#include <locale>
#include "services.h"
namespace Anope
{
class string;
-}
-/*******************************************************
- * This file contains classes and templates that deal
- * with the comparison and hashing of 'irc strings'.
- * An 'irc string' is a string which compares in a
- * case insensitive manner, and as per RFC 1459 will
- * treat [ identical to {, ] identical to }, and \
- * as identical to |.
- *
- * Our hashing functions are designed to accept
- * std::string and compare/hash them as type irc::string
- * by converting them internally. This makes them
- * backwards compatible with other code which is not
- * aware of irc::string.
- *******************************************************/
+ extern std::locale casemap;
-/** A mapping of uppercase to lowercase, including scandinavian
- * 'oddities' as specified by RFC1459, e.g. { -> [, and | -> \
- */
-unsigned const char rfc_case_insensitive_map[256] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */
- 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99, /* 80-99 */
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */
- 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */
- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */
-};
-
-/** Case insensitive map, ASCII rules.
- * That is;
- * [ != {, but A == a.
- */
-unsigned const char ascii_case_insensitive_map[256] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */
- 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, /* 80-99 */
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */
- 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */
- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */
-};
-
-/** The irc namespace contains a number of helper classes.
- */
-namespace irc
-{
- /** 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 irc_char_traits : std::char_traits<char>
+ template<typename charT>
+ class ascii_ctype : public std::ctype<charT>
{
- /** 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);
+ public:
+ charT do_toupper(charT c) const anope_override
+ {
+ if (c >= 'a' && c <= 'z')
+ return c - 32;
+ else
+ return c;
+ }
+
+ charT do_tolower(charT c) const anope_override
+ {
+ if (c >= 'A' && c <= 'Z')
+ return c + 32;
+ else
+ return c;
+ }
};
- /** This typedef declares irc::string based upon irc_char_traits.
- */
- typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
-
- struct CoreExport less
+ template<typename charT>
+ class rfc1459_ctype : public ascii_ctype<charT>
{
- /** Compare two Anope::strings as irc::strings and find which one is less
- * @param s1 The first string
- * @param s2 The second string
- * @return true if s1 < s2, else false
- */
- bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+ public:
+ charT do_toupper(charT c) const anope_override
+ {
+ if (c == '{' || c == '}' || c == '|')
+ return c - 32;
+ else
+ return ascii_ctype<charT>::do_toupper(c);
+ }
+
+ charT do_tolower(charT c) const anope_override
+ {
+ if (c == '[' || c == ']' || c == '\\')
+ return c + 32;
+ else
+ return ascii_ctype<charT>::do_tolower(c);
+ }
};
}
@@ -204,26 +131,6 @@ namespace ci
};
}
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline std::string operator+(std::string &leftval, irc::string &rightval)
-{
- return leftval + std::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline irc::string operator+(irc::string &leftval, std::string &rightval)
-{
- return leftval + irc::string(rightval.c_str());
-}
-
/* Define operators for + and == with ci::string to std::string for easy assignment
* and comparison
*
@@ -244,46 +151,6 @@ inline ci::string operator+(ci::string &leftval, std::string &rightval)
return leftval + ci::string(rightval.c_str());
}
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline irc::string operator+(irc::string &leftval, ci::string &rightval)
-{
- return leftval + irc::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline ci::string operator+(ci::string &leftval, irc::string &rightval)
-{
- return leftval + ci::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const std::string &leftval, const irc::string &rightval)
-{
- return leftval.c_str() == rightval;
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const irc::string &leftval, const std::string &rightval)
-{
- return leftval == rightval.c_str();
-}
-
/* Define operators for + and == with ci::string to std::string for easy assignment
* and comparison
*
@@ -304,40 +171,6 @@ inline bool operator==(const ci::string &leftval, const std::string &rightval)
return leftval == rightval.c_str();
}
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const ci::string &leftval, const irc::string &rightval)
-{
- return leftval.c_str() == rightval;
-}
-
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const irc::string &leftval, const ci::string &rightval)
-{
- return leftval == rightval.c_str();
-}
-
-/* Define operators != for irc::string to std::string for easy comparison
- */
-inline bool operator!=(const irc::string &leftval, const std::string &rightval)
-{
- return !(leftval == rightval.c_str());
-}
-
-/* Define operators != for std::string to irc::string for easy comparison
- */
-inline bool operator!=(const std::string &leftval, const irc::string &rightval)
-{
- return !(leftval.c_str() == rightval);
-}
-
/* Define operators != for ci::string to std::string for easy comparison
*/
inline bool operator!=(const ci::string &leftval, const std::string &rightval)
@@ -345,25 +178,11 @@ inline bool operator!=(const ci::string &leftval, const std::string &rightval)
return !(leftval == rightval.c_str());
}
-/* Define operators != for ci::string to irc::string for easy comparison
+/* Define operators != for std::string to ci::string for easy comparison
*/
inline bool operator!=(const std::string &leftval, const ci::string &rightval)
{
return !(leftval.c_str() == rightval);
}
-/* Define operators != for irc::string to ci::string for easy comparison
- */
-inline bool operator!=(const irc::string &leftval, const ci::string &rightval)
-{
- return !(leftval == rightval.c_str());
-}
-
-/* Define operators != for irc::string to ci::string for easy comparison
- */
-inline bool operator!=(const ci::string &leftval, const irc::string &rightval)
-{
- return !(leftval.c_str() == rightval);
-}
-
#endif // HASHCOMP_H
diff --git a/src/config.cpp b/src/config.cpp
index 51a930393..74ba31bd2 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -16,6 +16,7 @@
#include "access.h"
#include "opertype.h"
#include "channels.h"
+#include "hashcomp.h"
/*************************************************************************/
@@ -197,6 +198,22 @@ ServerConfig::ServerConfig() : config_data(), NSDefFlags(NickCoreFlagStrings), C
this->NameServer = "127.0.0.1";
}
}
+
+ if (this->CaseMap == "ascii")
+ Anope::casemap = std::locale(std::locale(), new Anope::ascii_ctype<char>());
+ else if (this->CaseMap == "rfc1459")
+ Anope::casemap = std::locale(std::locale(), new Anope::rfc1459_ctype<char>());
+ else
+ {
+ try
+ {
+ Anope::casemap = std::locale(this->CaseMap.c_str());
+ }
+ catch (const std::runtime_error &)
+ {
+ Log() << "Unknown casemap " << this->CaseMap << " - casemap not changed";
+ }
+ }
}
bool ServerConfig::CheckOnce(const Anope::string &tag)
@@ -1149,6 +1166,7 @@ ConfigItems::ConfigItems(ServerConfig *conf)
{"networkinfo", "nicklen", "31", new ValueContainerUInt(&conf->NickLen), DT_UINTEGER | DT_NORELOAD, ValidateNickLen},
{"networkinfo", "userlen", "10", new ValueContainerUInt(&conf->UserLen), DT_UINTEGER | DT_NORELOAD, NoValidation},
{"networkinfo", "hostlen", "64", new ValueContainerUInt(&conf->HostLen), DT_UINTEGER | DT_NORELOAD, NoValidation},
+ {"options", "casemap", "ascii", new ValueContainerString(&conf->CaseMap), DT_STRING, NoValidation},
{"options", "passlen", "32", new ValueContainerUInt(&conf->PassLen), DT_UINTEGER | DT_NORELOAD, NoValidation},
{"options", "seed", "0", new ValueContainerLUInt(&conf->Seed), DT_LUINTEGER, NoValidation},
{"options", "nobackupokay", "no", new ValueContainerBool(&conf->NoBackupOkay), DT_BOOLEAN, NoValidation},
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 84773b369..7ce28df13 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -12,89 +12,47 @@
#include "hashcomp.h"
#include "anope.h"
+/* Case map in use by Anope */
+std::locale Anope::casemap = std::locale(std::locale(), new Anope::ascii_ctype<char>());
+
/*
*
- * This is an implementation of two special string classes:
- *
- * irc::string which is a case-insensitive equivalent to
- * std::string which is not only case-insensitive but
- * can also do scandanavian comparisons, e.g. { = [, etc.
- *
- * ci::string which is a case-insensitive equivalent to
- * std::string.
- *
- * These classes depend on rfc_case_insensitive_map and
- * ascii_case_insensitive_map
+ * This is an implementation of a special string class, ci::string,
+ * which is a case-insensitive equivalent to std::string.
*
*/
-bool irc::irc_char_traits::eq(char c1st, char c2nd)
-{
- return rfc_case_insensitive_map[static_cast<unsigned char>(c1st)] == rfc_case_insensitive_map[static_cast<unsigned char>(c2nd)];
-}
-
-bool irc::irc_char_traits::ne(char c1st, char c2nd)
-{
- return rfc_case_insensitive_map[static_cast<unsigned char>(c1st)] != rfc_case_insensitive_map[static_cast<unsigned char>(c2nd)];
-}
-
-bool irc::irc_char_traits::lt(char c1st, char c2nd)
-{
- return rfc_case_insensitive_map[static_cast<unsigned char>(c1st)] < rfc_case_insensitive_map[static_cast<unsigned char>(c2nd)];
-}
-
-int irc::irc_char_traits::compare(const char *str1, const char *str2, size_t n)
-{
- for (unsigned i = 0; i < n; ++i)
- {
- if (rfc_case_insensitive_map[static_cast<unsigned char>(*str1)] > rfc_case_insensitive_map[static_cast<unsigned char>(*str2)])
- return 1;
-
- if (rfc_case_insensitive_map[static_cast<unsigned char>(*str1)] < rfc_case_insensitive_map[static_cast<unsigned char>(*str2)])
- return -1;
-
- if (!*str1 || !*str2)
- return 0;
-
- ++str1;
- ++str2;
- }
- return 0;
-}
-
-const char *irc::irc_char_traits::find(const char *s1, int n, char c)
-{
- while (n-- > 0 && rfc_case_insensitive_map[static_cast<unsigned char>(*s1)] != rfc_case_insensitive_map[static_cast<unsigned char>(c)])
- ++s1;
- return n >= 0 ? s1 : NULL;
-}
-
bool ci::ci_char_traits::eq(char c1st, char c2nd)
{
- return ascii_case_insensitive_map[static_cast<unsigned char>(c1st)] == ascii_case_insensitive_map[static_cast<unsigned char>(c2nd)];
+ const std::ctype<char> &ct = std::use_facet<std::ctype<char> >(Anope::casemap);
+ return ct.toupper(c1st) == ct.toupper(c2nd);
}
bool ci::ci_char_traits::ne(char c1st, char c2nd)
{
- return ascii_case_insensitive_map[static_cast<unsigned char>(c1st)] != ascii_case_insensitive_map[static_cast<unsigned char>(c2nd)];
+ const std::ctype<char> &ct = std::use_facet<std::ctype<char> >(Anope::casemap);
+ return ct.toupper(c1st) != ct.toupper(c2nd);
}
bool ci::ci_char_traits::lt(char c1st, char c2nd)
{
- return ascii_case_insensitive_map[static_cast<unsigned char>(c1st)] < ascii_case_insensitive_map[static_cast<unsigned char>(c2nd)];
+ const std::ctype<char> &ct = std::use_facet<std::ctype<char> >(Anope::casemap);
+ return ct.toupper(c1st) < ct.toupper(c2nd);
}
int ci::ci_char_traits::compare(const char *str1, const char *str2, size_t n)
{
+ const std::ctype<char> &ct = std::use_facet<std::ctype<char> >(Anope::casemap);
+
for (unsigned i = 0; i < n; ++i)
{
- if (ascii_case_insensitive_map[static_cast<unsigned char>(*str1)] > ascii_case_insensitive_map[static_cast<unsigned char>(*str2)])
- return 1;
+ register char c1 = ct.toupper(*str1), c2 = ct.toupper(*str2);
- if (ascii_case_insensitive_map[static_cast<unsigned char>(*str1)] < ascii_case_insensitive_map[static_cast<unsigned char>(*str2)])
+ if (c1 > c2)
+ return 1;
+ else if (c1 < c2)
return -1;
-
- if (!*str1 || !*str2)
+ else if (!c1 || !c2)
return 0;
++str1;
@@ -105,7 +63,9 @@ int ci::ci_char_traits::compare(const char *str1, const char *str2, size_t n)
const char *ci::ci_char_traits::find(const char *s1, int n, char c)
{
- while (n-- > 0 && ascii_case_insensitive_map[static_cast<unsigned char>(*s1)] != ascii_case_insensitive_map[static_cast<unsigned char>(c)])
+ const std::ctype<char> &ct = std::use_facet<std::ctype<char> >(Anope::casemap);
+ register char c_u = ct.toupper(c);
+ while (n-- > 0 && ct.toupper(*s1) != c_u)
++s1;
return n >= 0 ? s1 : NULL;
}
@@ -120,16 +80,6 @@ bool ci::less::operator()(const Anope::string &s1, const Anope::string &s2) cons
return s1.ci_str().compare(s2.ci_str()) < 0;
}
-/** Compare two Anope::strings as irc::strings and find which one is les
- * @param s1 The first string
- * @param s2 The second string
- * @return true if s1 < s2, else false
- */
-bool irc::less::operator()(const Anope::string &s1, const Anope::string &s2) const
-{
- return s1.irc_str().compare(s2.irc_str()) < 0;
-}
-
sepstream::sepstream(const Anope::string &source, char seperator) : tokens(source), sep(seperator)
{
last_starting_position = n = tokens.begin();
generated by cgit (git 2.34.1) at 2025-06-16 23:52:50 +0000