summaryrefslogtreecommitdiff
path: root/src/commands
diff options
context:
space:
mode:
authorRobin Burchell <viroteck@viroteck.net>2012-05-14 03:46:56 -0700
committerRobin Burchell <viroteck@viroteck.net>2012-05-14 03:46:56 -0700
commit44f42a13de52c8025942ddab42f51feb36821782 (patch)
treeabf109138750f763d91586daca0188608ecc9f56 /src/commands
parentfcacc8e0306382bc3f938073092c3729d77e2b41 (diff)
parenta3cdff95f4120526d0944a6bb6b3a96136466aa8 (diff)
Merge pull request #109 from Justasic/insp20
Rewrote the color codes parser to one function, not two
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/cmd_motd.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index 80838bcbf..9a236137d 100644
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -46,18 +46,6 @@ class CommandMotd : public Command
}
};
-inline std::string replace_all(const std::string &str, const std::string &orig, const std::string &repl)
-{
- std::string new_str = str;
- std::string::size_type pos = new_str.find(orig), orig_length = orig.length(), repl_length = repl.length();
- while (pos != std::string::npos)
- {
- new_str = new_str.substr(0, pos) + repl + new_str.substr(pos + orig_length);
- pos = new_str.find(orig, pos + repl_length);
- }
- return new_str;
-}
-
/*
* Replace all color codes from the special[] array to actual
* color code chars using C++ style escape sequences. You
@@ -66,39 +54,51 @@ inline std::string replace_all(const std::string &str, const std::string &orig,
*/
void ProcessColors(ConfigFileCache::iterator &file)
{
- static struct special_chars
+ static struct special_chars
+ {
+ std::string character;
+ std::string replace;
+ special_chars(const std::string &c, const std::string &r) : character(c), replace(r) { }
+ }
+
+ special[] = {
+ special_chars("\\002", "\002"), // Bold
+ special_chars("\\037", "\037"), // underline
+ special_chars("\\003", "\003"), // Color
+ special_chars("\\0017", "\017"), // Stop colors
+ special_chars("\\u", "\037"), // Alias for underline
+ special_chars("\\b", "\002"), // Alias for Bold
+ special_chars("\\x", "\017"), // Alias for stop
+ special_chars("\\c", "\003"), // Alias for color
+ special_chars("", "")
+ };
+
+ for(file_cache::iterator it = file->second.begin(); it != file->second.end(); it++)
+ {
+ std::string ret = *it;
+ for(int i = 0; special[i].character.empty() == false; ++i)
+ {
+ std::string::size_type pos = ret.find(special[i].character);
+ if(pos != std::string::npos && ret[pos-1] == '\\' && ret[pos] == '\\')
+ continue; // Skip double slashes.
+
+ // Replace all our characters in the array
+ while(pos != std::string::npos)
{
- std::string character;
- std::string replace;
- special_chars(const std::string &c, const std::string &r) : character(c), replace(r) { }
- }
-
- special[] = {
- special_chars("\\002", "\002"), // Bold
- special_chars("\\037", "\037"), // underline
- special_chars("\\003", "\003"), // Color
- special_chars("\\0017", "\017"), // Stop colors
- special_chars("\\u", "\037"), // Alias for underline
- special_chars("\\b", "\002"), // Alias for Bold
- special_chars("\\x", "\017"), // Alias for stop
- special_chars("\\c", "\003"), // Alias for color
- special_chars("", "")
- };
-
- for(file_cache::iterator it = file->second.begin(); it != file->second.end(); it++)
- {
- std::string ret = *it;
- for(int i = 0; special[i].character.empty() == false; ++i)
- {
- std::string::size_type pos = ret.find(special[i].character);
- if(pos != std::string::npos && ret[pos-1] == '\\' && ret[pos] == '\\')
- continue; // Skip double slashes.
-
- ret = replace_all(ret, special[i].character, special[i].replace);
- }
- // Replace double slashes with a single slash before we return
- *it = replace_all(ret, "\\\\", "\\");
+ ret = ret.substr(0, pos) + special[i].replace + ret.substr(pos + special[i].character.size());
+ pos = ret.find(special[i].character, pos + special[i].replace.size());
}
+ }
+
+ // Replace double slashes with a single slash before we return
+ std::string::size_type pos = ret.find("\\\\");
+ while(pos != std::string::npos)
+ {
+ ret = ret.substr(0, pos) + "\\" + ret.substr(pos + 2);
+ pos = ret.find("\\\\", pos + 1);
+ }
+ *it = ret;
+ }
}
/** Handle /MOTD