Changeset 42616d1

Timestamp:

2006-05-28T18:24:43Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

79b6213

Parents:

db28304

Message:

"ISON :nick1 nick2" works too now, which seems to be what the RFCs really
want (although the example says "ISON nick1 nick2").

File:

• irc_commands.c (modified) (2 diffs)

irc_commands.c

@@ -321 +321 @@
 {
         user_t *u;
-        char buff[IRC_MAX_LINE];
+        char buff[IRC_MAX_LINE], *s;
         int lenleft, i;
         
@@ -331 +331 @@
         for( i = 1; cmd[i]; i ++ )
         {
-                if( ( u = user_find( irc, cmd[i] ) ) && u->online )
-                {
-                        /* [SH] Make sure we don't use too much buffer space. */
-                        lenleft -= strlen( u->nick ) + 1;
-                        
-                        if( lenleft < 0 )
+                char *this, *next;
+                
+                this = cmd[i];
+                while( *this )
+                {
+                        if( ( next = strchr( this, ' ' ) ) )
+                                *next = 0;
+                        
+                        if( ( u = user_find( irc, this ) ) && u->online )
+                        {
+                                lenleft -= strlen( u->nick ) + 1;
+                                
+                                if( lenleft < 0 )
+                                        break;
+                                
+                                strcat( buff, u->nick );
+                                strcat( buff, " " );
+                        }
+                        
+                        if( next )
+                        {
+                                *next = ' ';
+                                this = next + 1;
+                        }
+                        else
                         {
                                 break;
-                        }
-                        
-                        /* [SH] Add the nick to the buffer. Note
-                         * that an extra space is always added. Even
-                         * if it's the last nick in the list. Who
-                         * cares?
-                         */
-                        
-                        strcat( buff, u->nick );
-                        strcat( buff, " " );
-                }
-        }
-        
-        /* [WvG] Well, maybe someone cares, so why not remove it? */
+                        }    
+                }
+                
+                /* *sigh* */
+                if( lenleft < 0 )
+                        break;
+        }
+        
         if( strlen( buff ) > 0 )
                 buff[strlen(buff)-1] = '\0';