Changeset 8358691

Timestamp:

2010-08-31T20:05:36Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f5c0d8e

Parents:

ad2d8bc

Message:

Added root_command_add() and use it to create the "otr" command.

Files:

• bitlbee.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• otr.c (modified) (3 diffs)
• otr.h (modified) (1 diff)
• root_commands.c (modified) (5 diffs)

bitlbee.h

@@ -165 +165 @@
 void root_command_string( irc_t *irc, char *command );
 void root_command( irc_t *irc, char *command[] );
+gboolean root_command_add( const char *command, int params, void (*func)(irc_t *, char **args), int flags );
 gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond );
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );

commands.h

@@ -37 +37 @@
 } command_t;
 
-extern const command_t commands[];
+extern command_t root_commands[];
 
 #define IRC_CMD_PRE_LOGIN       1

irc_commands.c

@@ -626 +626 @@
         irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK" );
         
-        for( i = 0; commands[i].command; i ++ )
-                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", commands[i].command );
+        for( i = 0; root_commands[i].command; i ++ )
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", root_commands[i].command );
         
         for( h = global.help; h; h = h->next )

otr.c

@@ -84 +84 @@
 /** otr sub-command handlers: **/
 
+static void cmd_otr(irc_t *irc, char **args);
 void cmd_otr_connect(irc_t *irc, char **args);
 void cmd_otr_disconnect(irc_t *irc, char **args);
@@ -199 +200 @@
         global.otr_ops.account_name = &op_account_name;
         global.otr_ops.account_name_free = NULL;
+        
+        root_command_add( "otr", 1, cmd_otr, 0 );
 }
 
@@ -418 +421 @@
 }
 
-void cmd_otr(irc_t *irc, char **args)
+static void cmd_otr(irc_t *irc, char **args)
 {
         const command_t *cmd;

otr.h

@@ -39 +39 @@
 struct im_connection;
 struct account;
-
-// 'otr' root command, hooked up in root_commands.c
-void cmd_otr(struct irc *, char **args);
 
 

root_commands.c

@@ -29 +29 @@
 #include "help.h"
 #include "ipc.h"
-#include "otr.h"
 
 void root_command_string( irc_t *irc, char *command )
@@ -56 +55 @@
         
         len = strlen( cmd[0] );
-        for( i = 0; commands[i].command; i++ )
-                if( g_strncasecmp( commands[i].command, cmd[0], len ) == 0 )
-                {
-                        if( commands[i+1].command &&
-                            g_strncasecmp( commands[i+1].command, cmd[0], len ) == 0 )
+        for( i = 0; root_commands[i].command; i++ )
+                if( g_strncasecmp( root_commands[i].command, cmd[0], len ) == 0 )
+                {
+                        if( root_commands[i+1].command &&
+                            g_strncasecmp( root_commands[i+1].command, cmd[0], len ) == 0 )
                                 /* Only match on the first letters if the match is unique. */
                                 break;
                         
-                        MIN_ARGS( commands[i].required_parameters );
+                        MIN_ARGS( root_commands[i].required_parameters );
                         
-                        commands[i].execute( irc, cmd );
+                        root_commands[i].execute( irc, cmd );
                         return;
                 }
@@ -1325 +1324 @@
 
 /* IMPORTANT: Keep this list sorted! The short command logic needs that. */
-const command_t commands[] = {
+command_t root_commands[] = {
         { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
@@ -1340 +1339 @@
         { "info",           1, cmd_info,           0 },
         { "no",             0, cmd_yesno,          0 },
-        { "otr",            1, cmd_otr,            0 }, 
         { "qlist",          0, cmd_qlist,          0 },
         { "register",       1, cmd_register,       0 },
@@ -1349 +1347 @@
         { "transfer",       0, cmd_transfer,       0 },
         { "yes",            0, cmd_yesno,          0 },
-        { NULL }
+        /* Not expecting too many plugins adding root commands so just make a
+           dumb array with some empty entried at the end. */
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
 };
+static const int num_root_commands = sizeof( root_commands ) / sizeof( command_t );
+
+gboolean root_command_add( const char *command, int params, void (*func)(irc_t *, char **args), int flags )
+{
+        int i;
+        
+        if( root_commands[num_root_commands-2].command )
+                /* Planning fail! List is full. */
+                return FALSE;
+        
+        for( i = 0; root_commands[i].command; i++ )
+        {
+                if( g_strcasecmp( root_commands[i].command, command ) == 0 )
+                        return FALSE;
+                else if( g_strcasecmp( root_commands[i].command, command ) > 0 )
+                        break;
+        }
+        memmove( root_commands + i + 1, root_commands + i,
+                 sizeof( command_t ) * ( num_root_commands - i - 1 ) );
+        
+        root_commands[i].command = g_strdup( command );
+        root_commands[i].required_parameters = params;
+        root_commands[i].execute = func;
+        root_commands[i].flags = flags;
+        
+        return TRUE;
+}