Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/commands/cmd_topic.cpp b/src/commands/cmd_topic.cpp
index f271a597d6a998395539222084a0e999d5e14c5b..0e1a115da81494a0f7f035dd6574414c16515808 100644 (file)
--- a/src/commands/cmd_topic.cpp
+++ b/src/commands/cmd_topic.cpp
@@ -20,38 +20,38 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandTopic(Instance);
 }
 
-CmdResult CommandTopic::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandTopic::Handle (const std::vector<std::string>& parameters, User *user)
 {
        Channel* Ptr;
 
-       if (pcnt == 1)
+       if (parameters.size() == 1)
        {
                Ptr = ServerInstance->FindChan(parameters[0]);
                if (Ptr)
                {
                        if ((Ptr->IsModeSet('s')) && (!Ptr->HasUser(user)))
                        {
-                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, Ptr->name);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), Ptr->name.c_str());
                                return CMD_FAILURE;
                        }
                        if (Ptr->topicset)
                        {
-                               user->WriteNumeric(332, "%s %s :%s", user->nick, Ptr->name, Ptr->topic);
-                               user->WriteNumeric(333, "%s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
+                               user->WriteNumeric(332, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
+                               user->WriteNumeric(333, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
                        }
                        else
                        {
-                               user->WriteNumeric(331, "%s %s :No topic is set.", user->nick, Ptr->name);
+                               user->WriteNumeric(331, "%s %s :No topic is set.", user->nick.c_str(), Ptr->name.c_str());
                        }
                }
                else
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
                return CMD_SUCCESS;
        }
-       else if (pcnt>1)
+       else if (parameters.size()>1)
        {
                Ptr = ServerInstance->FindChan(parameters[0]);
                if (Ptr)
@@ -60,17 +60,17 @@ CmdResult CommandTopic::Handle (const char* const* parameters, int pcnt, User *u
                        {
                                if (!Ptr->HasUser(user))
                                {
-                                       user->WriteNumeric(442, "%s %s :You're not on that channel!",user->nick, Ptr->name);
+                                       user->WriteNumeric(442, "%s %s :You're not on that channel!",user->nick.c_str(), Ptr->name.c_str());
                                        return CMD_FAILURE;
                                }
                                if ((Ptr->IsModeSet('t')) && (Ptr->GetStatus(user) < STATUS_HOP))
                                {
-                                       user->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", user->nick, Ptr->name);
+                                       user->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", user->nick.c_str(), Ptr->name.c_str());
                                        return CMD_FAILURE;
                                }
                        }
 
-                       char topic[MAXTOPIC];
+                       std::string topic;
 
                        if (IS_LOCAL(user))
                        {
@@ -79,26 +79,25 @@ CmdResult CommandTopic::Handle (const char* const* parameters, int pcnt, User *u
                                 */
                                int MOD_RESULT = 0;
 
-                               strlcpy(topic,parameters[1],MAXTOPIC-1);
+                               topic.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxTopic);
                                FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
                                if (MOD_RESULT)
                                        return CMD_FAILURE;
 
-                               strlcpy(Ptr->topic,topic,MAXTOPIC-1);
+                               Ptr->topic.assign(topic, 0, ServerInstance->Config->Limits.MaxTopic);
                        }
                        else
                        {
                                /* Sneaky shortcut, one string copy for a remote topic */
-                               strlcpy(Ptr->topic, parameters[1], MAXTOPIC-1);
+                               Ptr->topic.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxTopic);
                        }
 
-                       if (ServerInstance->Config->FullHostInTopic)
-                               strlcpy(Ptr->setby,user->GetFullHost(),127);
-                       else
-                               strlcpy(Ptr->setby,user->nick,127);
+                       Ptr->setby.assign(ServerInstance->Config->FullHostInTopic ?
+                                       user->GetFullHost() : user->nick,
+                                       0, 128);
 
                        Ptr->topicset = ServerInstance->Time();
-                       Ptr->WriteChannel(user, "TOPIC %s :%s", Ptr->name, Ptr->topic);
+                       Ptr->WriteChannel(user, "TOPIC %s :%s", Ptr->name.c_str(), Ptr->topic.c_str());
 
                        if (IS_LOCAL(user))
                                /* We know 'topic' will contain valid data here */
@@ -106,7 +105,7 @@ CmdResult CommandTopic::Handle (const char* const* parameters, int pcnt, User *u
                }
                else
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
        }