Changeset 7e563ed

Timestamp:

2006-01-04T12:09:07Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

08995b0

Parents:

0196c47

Message:

Moved root_command functions to commands.c

Files:

• bitlbee.c (modified) (1 diff)
• commands.c (modified) (2 diffs)
• commands.h (modified) (2 diffs)

bitlbee.c

@@ -287 +287 @@
         g_main_quit( global.loop );
 }
-
-int root_command_string( irc_t *irc, user_t *u, char *command, int flags )
-{
-        char *cmd[IRC_MAX_ARGS];
-        char *s;
-        int k;
-        char q = 0;
-        
-        memset( cmd, 0, sizeof( cmd ) );
-        cmd[0] = command;
-        k = 1;
-        for( s = command; *s && k < ( IRC_MAX_ARGS - 1 ); s ++ )
-                if( *s == ' ' && !q )
-                {
-                        *s = 0;
-                        while( *++s == ' ' );
-                        if( *s == '"' || *s == '\'' )
-                        {
-                                q = *s;
-                                s ++;
-                        }
-                        if( *s )
-                        {
-                                cmd[k++] = s;
-                                s --;
-                        }
-                }
-                else if( *s == q )
-                {
-                        q = *s = 0;
-                }
-        cmd[k] = NULL;
-        
-        return( root_command( irc, cmd ) );
-}
-
-int root_command( irc_t *irc, char *cmd[] )
-{       
-        int i;
-        
-        if( !cmd[0] )
-                return( 0 );
-        
-        for( i = 0; commands[i].command; i++ )
-                if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
-                {
-                        if( !cmd[commands[i].required_parameters] )
-                        {
-                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
-                                return( 0 );
-                        }
-                        commands[i].execute( irc, cmd );
-                        return( 1 );
-                }
-        
-        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
-        
-        return( 1 );
-}

commands.c

@@ -32 +32 @@
 #include <string.h>
 
-command_t commands[] = {
+const command_t commands[] = {
         { "help",           0, cmd_help }, 
         { "identify",       1, cmd_identify },
@@ -55 +55 @@
 };
 
+int root_command_string( irc_t *irc, user_t *u, char *command, int flags )
+{
+        char *cmd[IRC_MAX_ARGS];
+        char *s;
+        int k;
+        char q = 0;
+        
+        memset( cmd, 0, sizeof( cmd ) );
+        cmd[0] = command;
+        k = 1;
+        for( s = command; *s && k < ( IRC_MAX_ARGS - 1 ); s ++ )
+                if( *s == ' ' && !q )
+                {
+                        *s = 0;
+                        while( *++s == ' ' );
+                        if( *s == '"' || *s == '\'' )
+                        {
+                                q = *s;
+                                s ++;
+                        }
+                        if( *s )
+                        {
+                                cmd[k++] = s;
+                                s --;
+                        }
+                }
+                else if( *s == q )
+                {
+                        q = *s = 0;
+                }
+        cmd[k] = NULL;
+        
+        return( root_command( irc, cmd ) );
+}
+
+int root_command( irc_t *irc, char *cmd[] )
+{       
+        int i;
+        
+        if( !cmd[0] )
+                return( 0 );
+        
+        for( i = 0; commands[i].command; i++ )
+                if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
+                {
+                        if( !cmd[commands[i].required_parameters] )
+                        {
+                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
+                                return( 0 );
+                        }
+                        commands[i].execute( irc, cmd );
+                        return( 1 );
+                }
+        
+        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        
+        return( 1 );
+}
+
 int cmd_help( irc_t *irc, char **cmd )
 {

commands.h

@@ -29 +29 @@
 #include "bitlbee.h"
 
-/* Hmm... Linked list? Plleeeeaaase?? ;-) */
-
 typedef struct command_t
 {
@@ -58 +56 @@
 int cmd_dump( irc_t *irc, char **cmd );
 
-
-
-extern command_t commands[];
+extern const command_t commands[];
 
 #endif