Merge pull request #113 from nenolod/feature/mlock

[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 5fa041b8f68b54f3139085c4f5d052468e6da7de..2d4d42a1f4c26611f34fd986fa9c8c598bf86e16 100644 (file)
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -1,20 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-#ifndef __CMD_COMMANDS_H__
-#define __CMD_COMMANDS_H__
+#ifndef CMD_COMMANDS_H
+#define CMD_COMMANDS_H
 
 // include the common header files
 
@@ -31,7 +38,7 @@ class CommandCommands : public Command
  public:
        /** Constructor for commands.
         */
-       CommandCommands (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"COMMANDS",0,0) { }
+       CommandCommands ( Module* parent) : Command(parent,"COMMANDS",0,0) { }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -48,16 +55,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;
 }