Fix MySQL crash on module unload with empty query queue

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

diff --git a/src/commands/cmd_part.cpp b/src/commands/cmd_part.cpp
index aaff9e30fb300f35fd5e32463bd5d20ebae079a4..ba8420cd69b063f40edd5f5e9493fadcb6924abd 100644 (file)
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,51 +12,64 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_part.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /PART. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandPart : public Command
 {
-       return new CommandPart(Instance);
-}
+ public:
+       /** Constructor for part.
+        */
+       CommandPart (Module* parent) : Command(parent,"PART", 1, 2) { Penalty = 5; syntax = "<channel>{,<channel>} [<reason>]"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
-CmdResult CommandPart::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string reason;
 
        if (IS_LOCAL(user))
        {
-               if (*ServerInstance->Config->FixedPart)
+               if (!ServerInstance->Config->FixedPart.empty())
                        reason = ServerInstance->Config->FixedPart;
                else
                {
-                       if (pcnt > 1)
-                               reason = ServerInstance->Config->PrefixPart + std::string(parameters[1]) + ServerInstance->Config->SuffixPart;
+                       if (parameters.size() > 1)
+                               reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
                        else
                                reason = "";
                }
        }
        else
        {
-               reason = pcnt ? parameters[1] : "";
+               reason = parameters.size() > 1 ? parameters[1] : "";
        }
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
 
        Channel* c = ServerInstance->FindChan(parameters[0]);
-       
+
        if (c)
        {
-               const char *rreason = reason.empty() ? NULL : reason.c_str();
-               if (!c->PartUser(user, rreason))
-                       /* Arse, who stole our channel! :/ */
-                       delete c;
+               c->PartUser(user, reason);
        }
        else
        {
-               user->WriteServ( "401 %s %s :No such channel", user->nick, parameters[0]);
+               user->WriteServ( "401 %s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandPart)