Changeset c7eb771

Timestamp:

2010-06-28T00:18:40Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ab6006c

Parents:

1c40aa7

Message:

Hacky support for short subcommands (i.e. "ac l" instead of "account list".).

File:

• root_commands.c (modified) (13 diffs)

root_commands.c

@@ -323 +323 @@
 {
         account_t *a;
+        int len;
         
         if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
@@ -330 +331 @@
         }
         
-        if( g_strcasecmp( cmd[1], "add" ) == 0 )
+        len = strlen( cmd[1] );
+        
+        if( len >= 1 && g_strncasecmp( cmd[1], "add", len ) == 0 )
         {
                 struct prpl *prpl;
@@ -356 +359 @@
                 return;
         }
-        else if( g_strcasecmp( cmd[1], "list" ) == 0 )
+        else if( len >= 1 && g_strncasecmp( cmd[1], "list", len ) == 0 )
         {
                 int i = 0;
@@ -388 +391 @@
                 /* Try the following two only if cmd[2] == NULL */
         }
-        else if( g_strcasecmp( cmd[1], "on" ) == 0 )
+        else if( len >= 2 && g_strncasecmp( cmd[1], "on", len ) == 0 )
         {
                 if ( irc->b->accounts )
@@ -405 +408 @@
                 return;
         }
-        else if( g_strcasecmp( cmd[1], "off" ) == 0 )
+        else if( len >= 2 && g_strncasecmp( cmd[1], "off", len ) == 0 )
         {
                 irc_usermsg( irc, "Deactivating all active (re)connections..." );
@@ -421 +424 @@
         
         MIN_ARGS( 2 );
+        len = strlen( cmd[2] );
         
         /* At least right now, don't accept on/off/set/del as account IDs even
@@ -437 +441 @@
         }
         
-        if( g_strcasecmp( cmd[2], "del" ) == 0 )
+        if( len >= 1 && g_strncasecmp( cmd[2], "del", len ) == 0 )
         {
                 if( a->ic )
@@ -449 +453 @@
                 }
         }
-        else if( g_strcasecmp( cmd[2], "on" ) == 0 )
+        else if( len >= 2 && g_strncasecmp( cmd[2], "on", len ) == 0 )
         {
                 if( a->ic )
@@ -456 +460 @@
                         account_on( irc->b, a );
         }
-        else if( g_strcasecmp( cmd[2], "off" ) == 0 )
+        else if( len >= 2 && g_strncasecmp( cmd[2], "off", len ) == 0 )
         {
                 if( a->ic )
@@ -472 +476 @@
                 }
         }
-        else if( g_strcasecmp( cmd[2], "set" ) == 0 )
+        else if( len >= 1 && g_strncasecmp( cmd[2], "set", len ) == 0 )
         {
                 cmd_set_real( irc, cmd + 2, &a->set, cmd_account_set_checkflags );
@@ -485 +489 @@
 {
         irc_channel_t *ic;
-        
-        if( g_strcasecmp( cmd[1], "list" ) == 0 )
+        int len;
+        
+        len = strlen( cmd[1] );
+        
+        if( len >= 1 && g_strncasecmp( cmd[1], "list", len ) == 0 )
         {
                 GSList *l;
@@ -510 +517 @@
         
         MIN_ARGS( 2 );
+        len = strlen( cmd[2] );
         
         if( ( ic = irc_channel_get( irc, cmd[1] ) ) == NULL )
@@ -517 +525 @@
         }
         
-        if( g_strcasecmp( cmd[2], "set" ) == 0 )
+        if( len >= 1 && g_strncasecmp( cmd[2], "set", len ) == 0 )
         {
                 cmd_set_real( irc, cmd + 2, &ic->set, NULL );
         }
-        else if( g_strcasecmp( cmd[2], "del" ) == 0 )
+        else if( len >= 1 && g_strncasecmp( cmd[2], "del", len ) == 0 )
         {
                 if( !( ic->flags & IRC_CHANNEL_JOINED ) &&