Changeset 8e419cb for commands.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• commands.c (modified) (5 diffs)

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 )
 {
@@ -97 +156 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted" );
+                irc_umode_set( irc, "+R", 1 );
                 break;
         default:
@@ -122 +182 @@
                 case STORAGE_OK:
                         irc->status = USTATUS_IDENTIFIED;
+                        irc_umode_set( irc, "+R", 1 );
                         break;
 
@@ -146 +207 @@
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
+                irc->status = USTATUS_LOGGED_IN;
+                irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 return( 0 );