Changeset 4c17d19

Timestamp:

2010-05-10T09:05:26Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3663bb3

Parents:

a067771

Message:

Fixed irc_channel_name_ok(): One-character channel names are okay, also the
first character after the prefix *can* be a number.

File:

• irc_channel.c (modified) (1 diff)

irc_channel.c

@@ -202 +202 @@
 gboolean irc_channel_name_ok( const char *name )
 {
-        return strchr( CTYPES, name[0] ) != NULL && nick_ok( name + 1 );
+        char name_[strlen(name)+1];
+        
+        /* Check if the first character is in CTYPES (#&) */
+        if( strchr( CTYPES, name[0] ) == NULL )
+                return FALSE;
+        
+        /* Check the rest of the name. Just checking name + 1 doesn't work
+           since it will fail if the first character is a number, or if
+           it's a one-char channel name - both of which are legal. */
+        name_[0] = '_';
+        strcpy( name_ + 1, name + 1 );
+        return nick_ok( name_ );
 }