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

[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 51590f143de6db7febf128726710857cb24d8b3f..a9f27de83c7cb725644ec74cf0d241859652de10 100644 (file)
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -15,7 +15,9 @@
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-static const char *get_first_visible_channel(User *u)
+static const std::string star = "*";
+
+static const std::string& get_first_visible_channel(User *u)
 {
        UCListIter i = u->chans.begin();
        if (i != u->chans.end())
@@ -24,7 +26,7 @@ static const char *get_first_visible_channel(User *u)
                        return i->first->name;
        }
 
-       return "*";
+       return star;
 }
 
 bool CommandWho::whomatch(User* user, const char* matchtext)
@@ -138,7 +140,7 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch
        if (u->Visibility && !u->Visibility->VisibleTo(user))
                return;
 
-       std::string lcn = get_first_visible_channel(u);
+       const std::string& lcn = get_first_visible_channel(u);
        Channel* chlast = ServerInstance->FindChan(lcn);
 
        std::string wholine =   initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
@@ -209,15 +211,15 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                }
        }
 
+       if (ServerInstance->FindServerName(matchtext))
+               usingwildcards = true;
+
        if (parameters.size() > 1)
        {
-               /* parse flags */
-               const char *iter = parameters[1].c_str();
-
                /* 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)
                        {
@@ -257,8 +259,6 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                                        opt_far = true;
                                break;
                        }
-
-                       *iter++;
                }
        }
 
@@ -337,13 +337,13 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
        {
                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].c_str() ? parameters[0].c_str() : "*");
+               user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick.c_str(), *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].c_str());
+               user->WriteNumeric(315, "%s %s :Too many results",user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }