Made it compile :p

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 4f5b962b9f25c6bfaf347e5ad1bfd430d4179671..26a60386773f8102bda78f95ab03f99738163698 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -58,7 +58,6 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
@@ -115,12 +114,9 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
        }
        else
        {
-               if (strlen(parameters[0]) > 1)
+               if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0))
                {
-                       if (parameters[0][0] == ':')
-                       {
-                               *parameters[0]++;
-                       }
+                       parameters[0]++;
                }
                if (matches_qline(parameters[0]))
                {
@@ -153,7 +149,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
                
        }
 
-       strlcpy(oldnick,user->nick,NICKMAX);
+       strlcpy(oldnick, user->nick, NICKMAX - 1);
 
        /* change the nick of the user in the users_hash */
        user = ReHashNick(user->nick, parameters[0]);
@@ -161,7 +157,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
        if (!user) return;
        if (!user->nick) return;
 
-       strlcpy(user->nick, parameters[0],NICKMAX);
+       strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
        log(DEBUG,"new nick set: %s",user->nick);