More tweaks

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index c863d799850868d3991dc3d9d11490139b72a55f..a2cc3343a0d82cfc97713ed7bc681db1dd43a4d8 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -19,7 +19,7 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_whois.h"
 
 const char* Spacify(char* n)
@@ -88,8 +88,8 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
        }
        else
        {
-               user->WriteServ("401 %s %s :No such nick/channel",user->nick, nick);
-               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, nick);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
        }
 }
 
@@ -107,8 +107,8 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
        else
        {
                /* no such nick/channel */
-               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
-               user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
+               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] : "*");
        }
 }