diff options
| -rw-r--r-- | make/template/main.mk | 7 | ||||
| -rw-r--r-- | src/commands/cmd_list.cpp | 2 | ||||
| -rw-r--r-- | src/commands/cmd_motd.cpp | 86 |
3 files changed, 48 insertions, 47 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index eb551ba74..9a5f4db05 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -212,7 +212,7 @@ install: target @-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data @-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs @-install -d -m $(INSTMODE_DIR) $(BINPATH) - @-install -d -m $(INSTMODE_DIR) $(CONPATH) + @-install -d -m $(INSTMODE_DIR) $(CONPATH)/examples @-install -d -m $(INSTMODE_DIR) $(MODPATH) [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH) @IFNDEF PURE_STATIC @@ -220,7 +220,7 @@ install: target @ENDIF -install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null -install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null - -install -m $(INSTMODE_LIB) docs/*.example $(CONPATH) + -install -m $(INSTMODE_LIB) docs/*.example $(CONPATH)/examples @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" @@ -231,7 +231,8 @@ install: target @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) @echo 'To start the ircd, run:' $(BASE)/inspircd start - @echo 'Remember to edit your config file:' $(CONPATH)/inspircd.conf + @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf + @echo 'Examples are available at:' $(CONPATH)/examples/ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh) @BSD_ONLY RCS_FILES = src/version.sh diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp index 02b65df48..2f417bc04 100644 --- a/src/commands/cmd_list.cpp +++ b/src/commands/cmd_list.cpp @@ -73,7 +73,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User if (too_many || too_few) continue; - if (parameters.size() && (parameters[0][0] != '<' && parameters[0][0] != '>')) + if (parameters.size() && !parameters[0].empty() && (parameters[0][0] != '<' && parameters[0][0] != '>')) { if (!InspIRCd::Match(i->second->name, parameters[0]) && !InspIRCd::Match(i->second->topic, parameters[0])) continue; 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 |