Rewrote the color codes parser to be one function, not two

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index c2494845f4919e0deb1d7669feb56e6eb67dacf4..b0f61a835737c94ca8efba1b89c54408d7d3c1a9 100644 (file)
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -39,18 +39,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
@@ -59,39 +47,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