Changeset 18ff38f

Timestamp:

2008-03-29T23:15:04Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5ecf96b

Parents:

a199d33

Message:

Be more liberal with accepted line endings. ERC on Windows likes to use
"\r\r\n", for example, and until now BitlBee only chopped off the \r\n,
leaving the first \r as part of the command, which means it couldn't log
in to BitlBee at all. (Bad character in nickname.)

Files:

• irc.c (modified) (2 diffs)
• tests/check_irc.c (modified) (1 diff)

irc.c

@@ -297 +297 @@
                         char conv[IRC_MAX_LINE+1];
                         
-                        /* [WvG] Because irc_tokenize splits at every newline, the lines[] list
-                            should end with an empty string. This is why this actually works.
-                            Took me a while to figure out, Maurits. :-P */
+                        /* [WvG] If the last line isn't empty, it's an incomplete line and we
+                           should wait for the rest to come in before processing it. */
                         if( lines[i+1] == NULL )
                         {
@@ -369 +368 @@
 char **irc_tokenize( char *buffer )
 {
-        int i, j;
+        int i, j, n = 3;
         char **lines;
 
-        /* Count the number of elements we're gonna need. */
-        for( i = 0, j = 1; buffer[i] != '\0'; i ++ )
-        {
-                if( buffer[i] == '\n' )
-                        if( buffer[i+1] != '\r' && buffer[i+1] != '\n' )
-                                j ++;
-        }
-        
-        /* Allocate j+1 elements. */
-        lines = g_new( char *, j + 1 );
+        /* Allocate n+1 elements. */
+        lines = g_new( char *, n + 1 );
+        
+        lines[0] = buffer;
+        
+        /* Split the buffer in several strings, and accept any kind of line endings,
+         * knowing that ERC on Windows may send something interesting like \r\r\n,
+         * and surely there must be clients that think just \n is enough... */
+        for( i = 0, j = 0; buffer[i] != '\0'; i ++ )
+        {
+                if( buffer[i] == '\r' || buffer[i] == '\n' )
+                {
+                        while( buffer[i] == '\r' || buffer[i] == '\n' )
+                                buffer[i++] = '\0';
+                        
+                        lines[++j] = buffer + i;
+                        
+                        if( j >= n )
+                        {
+                                n *= 2;
+                                lines = g_renew( char *, lines, n + 1 );
+                        }
+
+                        if( buffer[i] == '\0' )
+                                break;
+                }
+        }
         
         /* NULL terminate our list. */ 
-        lines[j] = NULL;
-        
-        lines[0] = buffer;
-        
-        /* Split the buffer in several strings, using \r\n as our seperator, where \r is optional.
-         * Although this is not in the RFC, some braindead ircds (newnet's) use this, so some clients might too. 
-         */
-        for( i = 0, j = 0; buffer[i] != '\0'; i ++)
-        {
-                if( buffer[i] == '\n' )
-                {
-                        buffer[i] = '\0';
-                        
-                        if( i > 0 && buffer[i-1] == '\r' )
-                                buffer[i-1] = '\0';
-                        if( buffer[i+1] != '\r' && buffer[i+1] != '\n' )
-                                lines[++j] = buffer + i + 1;
-                }
-        }
-        
-        return( lines );
+        lines[++j] = NULL;
+        
+        return lines;
 }
 

tests/check_irc.c

@@ -37 +37 @@
         irc = irc_new(g_io_channel_unix_get_fd(ch1));
 
-        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\n"
-                        "USER a a a a\r\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
+        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
+                        "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
         fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);