Annotations

[user/henk/code/inspircd.git] / src / cmd_whois.cpp

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index a2cc3343a0d82cfc97713ed7bc681db1dd43a4d8..c0c5b97a3eb0575bcbb50c0bbe9b3f5c5e5711bc 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -18,19 +18,8 @@
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-
 #include "commands/cmd_whois.h"
-
-const char* Spacify(char* n)
-{
-       static char x[MAXBUF];
-       strlcpy(x,n,MAXBUF);
-       for (char* y = x; *y; y++)
-               if (*y == '_')
-                       *y = ' ';
-       return x;
-}
+#include "hashcomp.h"
 
 void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
@@ -68,7 +57,7 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
                }
                if (*dest->oper)
                {
-                       user->WriteServ("313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), ServerInstance->Config->Network);
+                       user->WriteServ("313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network);
                }
                if ((!signon) && (!idle))
                {
@@ -93,11 +82,18 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
        }
 }
 
-void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_whois(Instance);
+}
+
+CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-               return;
+               return CMD_SUCCESS;
 
        dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
@@ -109,6 +105,9 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
                /* no such nick/channel */
                user->WriteServ("401 %s %s :No such nick/channel",user->nick, *parameters[0] ? parameters[0] : "*");
                user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }