Show keys to opers correctly

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

diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index 2758f6b85e653df48b5374c3f4413df7d94a923c..2c91cb6e761ee31b28604e758cb306c6340f3c00 100644 (file)
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -165,7 +165,7 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch
        whoresults.push_back(wholine);
 }
 
-CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *user)
 {
        /*
         * XXX - RFC says:
@@ -191,13 +191,14 @@ CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *use
        std::vector<std::string> whoresults;
        std::string initial = "352 " + std::string(user->nick) + " ";
 
-       const char* matchtext = NULL;
+       char matchtext[MAXBUF];
        bool usingwildcards = false;
 
        /* Change '0' into '*' so the wildcard matcher can grok it */
-       matchtext = parameters[0];
-       if (!strcmp(matchtext,"0"))
-               matchtext = "*";
+       if (parameters[0] == "0")
+               strlcpy(matchtext, "*", MAXBUF);
+       else
+               strlcpy(matchtext, parameters[0].c_str(), MAXBUF);
 
        for (const char* check = matchtext; *check; check++)
        {
@@ -208,15 +209,15 @@ CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *use
                }
        }
 
-       if (pcnt > 1)
-       {
-               /* parse flags */
-               const char *iter = parameters[1];
+       if (ServerInstance->FindServerName(matchtext))
+               usingwildcards = true;
 
+       if (parameters.size() > 1)
+       {
                /* Fix for bug #444, WHO flags count as a wildcard */
                usingwildcards = true;
 
-               while (*iter)
+               for (std::string::const_iterator iter = parameters[1].begin(); iter != parameters[1].end(); ++iter)
                {
                        switch (*iter)
                        {
@@ -256,8 +257,6 @@ CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *use
                                        opt_far = true;
                                break;
                        }
-
-                       *iter++;
                }
        }
 
@@ -336,13 +335,13 @@ CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *use
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);
-               user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick, *parameters[0].c_str() ? parameters[0].c_str() : "*");
                return CMD_SUCCESS;
        }
        else
        {
                /* BZZT! Too many results. */
-               user->WriteNumeric(315, "%s %s :Too many results",user->nick, parameters[0]);
+               user->WriteNumeric(315, "%s %s :Too many results",user->nick, parameters[0].c_str());
                return CMD_FAILURE;
        }
 }