Changeset f1d38f2

Timestamp:

2006-01-21T22:23:58Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

54879ab, 87de505

Parents:

f73b969

Message:

Fixed counting of arguments in i[rp]c_exec(), made them a bit too simple.

Files:

• ipc.c (modified) (3 diffs)
• irc_commands.c (modified) (3 diffs)

ipc.c

@@ -155 +155 @@
 static void ipc_command_exec( void *data, char **cmd, const command_t *commands )
 {
-        int i;
+        int i, j;
         
         if( !cmd[0] )
@@ -163 +163 @@
                 if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
                 {
+                        /* There is no typo in this line: */
+                        for( j = 1; cmd[j]; j ++ ); j --;
+                        
+                        if( j < commands[i].required_parameters )
+                                break;
+                        
                         if( commands[i].flags & IPC_CMD_TO_CHILDREN )
                                 ipc_to_children( cmd );
@@ -168 +174 @@
                                 commands[i].execute( data, cmd );
                         
-                        return;
+                        break;
                 }
 }

irc_commands.c

@@ -579 +579 @@
 void irc_exec( irc_t *irc, char *cmd[] )
 {       
-        int i;
+        int i, n_arg;
         
         if( !cmd[0] )
@@ -587 +587 @@
                 if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
                 {
+                        /* There should be no typo in the next line: */
+                        for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
+                        
                         if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
                         {
@@ -599 +602 @@
                                 irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
                         }
-                        else if( !cmd[irc_commands[i].required_parameters] )
+                        else if( n_arg < irc_commands[i].required_parameters )
                         {
                                 irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );