Make rehash work more than once per run, and fix some uninitialized values in connect...

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 7c18c8ab19cd8cb772bac95d3eddeecc479f34ca..94a4a55fe741937f1927e431db566f44d58490cf 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -374,7 +374,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                                                                                user->nick.c_str(), command.c_str());
                }
 
-               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+               ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)",
                                command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
@@ -506,23 +506,20 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
                cmdlist.erase(cmdlist.find(cmd));
 
                RFCCommands.erase(cmd);
-               std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
                delete cmdptr;
                dlclose(command->second);
-
-               snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
-               const char* err = this->LoadCommand(filename);
-               if (err)
-               {
-                       if (user)
-                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err);
-                       return false;
-               }
-
-               return true;
        }
 
-       return false;
+       std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
+       snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
+       const char* err = this->LoadCommand(filename);
+       if (err)
+       {
+               if (user)
+                       user->WriteServ("NOTICE %s :*** Error loading '%s': %s", user->nick.c_str(), filename, err);
+               return false;
+       }
+       return true;
 }
 
 CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
@@ -534,12 +531,12 @@ CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User
        if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
        {
                user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }
        else
        {
-               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s'. The command will not work until reloaded successfully.", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }
@@ -609,6 +606,50 @@ void CommandParser::SetupCommandTable()
                this->CreateCommand(new CommandReload(ServerInstance));
 }
 
+int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
+{
+       std::deque<std::string>::const_iterator items = source.begin();
+       std::deque<TranslateType>::const_iterator types = to.begin();
+       User* user = NULL;
+       int translations = 0;
+       dest.clear();
+
+       while (items != source.end() && types != to.end())
+       {
+               TranslateType t = *types;
+               std::string item = *items;
+               types++;
+               items++;
+
+               switch (t)
+               {
+                       case TR_NICK:
+                               /* Translate single nickname */
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                       break;
+                       break;
+                       case TR_END:
+                       case TR_TEXT:
+                       default:
+                               /* Do nothing */
+                               dest.append(item);
+                       break;
+               }
+               dest.append(" ");
+       }
+
+       if (!dest.empty())
+               dest.erase(dest.end() - 1);
+       return translations;
+}
+
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
 {
        User* user = NULL;
@@ -629,46 +670,6 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
                        else
                                dest = source;
                break;
-               case TR_NICKLIST:
-               {
-                       /* Translate comma seperated list of nicknames */
-                       irc::commasepstream items(source);
-                       while (items.GetToken(item))
-                       {
-                               user = ServerInstance->FindNick(item);
-                               if (user)
-                               {
-                                       dest.append(user->uuid);
-                                       translations++;
-                               }
-                               else
-                                       dest.append(item);
-                               dest.append(",");
-                       }
-                       if (!dest.empty())
-                               dest.erase(dest.end() - 1);
-               }
-               break;
-               case TR_SPACENICKLIST:
-               {
-                       /* Translate space seperated list of nicknames */
-                       irc::spacesepstream items(source);
-                       while (items.GetToken(item))
-                       {
-                               user = ServerInstance->FindNick(item);
-                               if (user)
-                               {
-                                       dest.append(user->uuid);
-                                       translations++;
-                               }
-                               else
-                                       dest.append(item);
-                               dest.append(" ");
-                       }
-                       if (!dest.empty())
-                               dest.erase(dest.end() - 1);
-               }
-               break;
                case TR_END:
                case TR_TEXT:
                default: