Resolve /STATS S conflict between SVSHOLD and SHUN

[user/henk/code/inspircd.git] / src / commands / cmd_commands.cpp

diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 63b4b24fb68fe5ce83633aa1605ef4337af8db84..4b1e3e9be88bb56afdf69e3b1ea6fd10e6086174 100644 (file)
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -48,16 +48,21 @@ class CommandCommands : public Command
  */
 CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
 {
+       std::vector<std::string> list;
+       list.reserve(ServerInstance->Parser->cmdlist.size());
        for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
        {
                Module* src = i->second->creator;
-               user->WriteNumeric(RPL_COMMANDS, "%s :%s %s %d %d",
-                               user->nick.c_str(),
-                               i->second->command.c_str(),
-                               src ? src->ModuleSourceFile.c_str() : "<core>",
-                               i->second->min_params,
-                               i->second->Penalty);
+               char buffer[MAXBUF];
+               snprintf(buffer, MAXBUF, ":%s %03d %s :%s %s %d %d",
+                       ServerInstance->Config->ServerName.c_str(), RPL_COMMANDS, user->nick.c_str(),
+                       i->second->name.c_str(), src->ModuleSourceFile.c_str(),
+                       i->second->min_params, i->second->Penalty);
+               list.push_back(buffer);
        }
+       sort(list.begin(), list.end());
+       for(unsigned int i=0; i < list.size(); i++)
+               user->Write(list[i]);
        user->WriteNumeric(RPL_COMMANDSEND, "%s :End of COMMANDS list",user->nick.c_str());
        return CMD_SUCCESS;
 }