Changeset 07054a5

Timestamp:

2008-08-31T22:49:32Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c1333754

Parents:

3b99524

Message:

"chat add" can generate a channel name by itself if necessary. Also fixed
MIN_ARGS, using a variable named i showed why precompiler macros really
are evil. :-)

File:

• root_commands.c (modified) (3 diffs)

root_commands.c

@@ -81 +81 @@
         do                                                                     \
         {                                                                      \
-                int i;                                                         \
-                for( i = 1; i <= x; i ++ )                                     \
-                        if( cmd[i] == NULL )                                   \
+                int blaat;                                                     \
+                for( blaat = 0; blaat <= x; blaat ++ )                         \
+                        if( cmd[blaat] == NULL )                               \
                         {                                                      \
                                 irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
@@ -1008 +1008 @@
         if( g_strcasecmp( cmd[1], "add" ) == 0 )
         {
-                MIN_ARGS( 4 );
+                char *channel, *s;
+                
+                MIN_ARGS( 3 );
                 
                 if( !( acc = account_get( irc, cmd[2] ) ) )
@@ -1016 +1018 @@
                 }
                 
-                if( ( c = chat_add( irc, acc, cmd[3], cmd[4] ) ) )
+                if( cmd[4] == NULL )
+                {
+                        channel = g_strdup( cmd[3] );
+                        if( ( s = strchr( channel, '@' ) ) )
+                                *s = 0;
+                }
+                else
+                {
+                        channel = g_strdup( cmd[4] );
+                }
+                
+                if( strchr( CTYPES, channel[0] ) == NULL )
+                {
+                        s = g_strdup_printf( "%c%s", CTYPES[0], channel );
+                        g_free( channel );
+                        channel = s;
+                }
+                
+                if( ( c = chat_add( irc, acc, cmd[3], channel ) ) )
                         irc_usermsg( irc, "Chatroom added successfully." );
                 else
                         irc_usermsg( irc, "Could not add chatroom." );
+                
+                g_free( channel );
         }
         else if( g_strcasecmp( cmd[1], "list" ) == 0 )