Changeset 9a9b520

Timestamp:

2010-07-08T22:31:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b556e46, f3b6764

Parents:

69b896b

Message:

Allow nick changes if they're only different in capitalisation, fixed
faulty responses in the NICK command, and fixing crash bug in nick changes
before finishing login.

Files:

• irc_commands.c (modified) (2 diffs)
• irc_user.c (modified) (1 diff)
• root_commands.c (modified) (2 diffs)

irc_commands.c

@@ -72 +72 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc_user_by_name( irc, cmd[1] ) )
-        {
-                irc_send_num( irc, 433, ":This nick is already in use" );
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[1] ) ) && iu != irc->user )
+        {
+                irc_send_num( irc, 433, "%s :This nick is already in use", cmd[1] );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_send_num( irc, 432, ":This nick contains invalid characters" );
-        }
-        else if( irc->user->nick )
+                irc_send_num( irc, 432, "%s :This nick contains invalid characters", cmd[1] );
+        }
+        else if( irc->status & USTATUS_LOGGED_IN )
         {
                 if( irc->status & USTATUS_IDENTIFIED )
@@ -98 +100 @@
         else
         {
+                g_free( irc->user->nick );
                 irc->user->nick = g_strdup( cmd[1] );
                 

irc_user.c

@@ -120 +120 @@
 {
         irc_t *irc = iu->irc;
+        irc_user_t *new_iu;
         char key[strlen(new)+1];
         GSList *cl;
         
         strcpy( key, new );
-        if( iu == NULL || !nick_lc( key ) || irc_user_by_name( irc, new ) )
+        if( iu == NULL || !nick_lc( key ) ||
+            ( ( new_iu = irc_user_by_name( irc, new ) ) && new_iu != iu ) )
                 return 0;
         

root_commands.c

@@ -662 +662 @@
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
+        irc_user_t *iu, *old;
         
         iu = irc_user_by_name( irc, cmd[1] );
@@ -678 +678 @@
                 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
-        else if( irc_user_by_name( irc, cmd[2] ) )
+        else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
                 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );