Changeset a3a3778 for protocols/msn

Timestamp:

2006-12-22T17:17:08Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5c5a586, 9225e08

Parents:

55078f5 (diff), bd28e6a (diff), a51be64 (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:

Merging trees.

Location:

protocols/msn

Files:

• Makefile (modified) (1 diff)
• sb.c (modified) (2 diffs)

protocols/msn/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: msn_mod.o
+check: all
+gcov: 
+        gcov *.c
         
 .PHONY: all clean distclean

protocols/msn/sb.c

@@ -122 +122 @@
         if( sb->ready )
         {
-                char cmd[1024], *buf;
+                char *packet, *buf;
                 int i, j;
                 
+                /* Build the message. Convert LF to CR-LF for normal messages. */
                 if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
                 {
@@ -142 +143 @@
                 {
                         i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username );
-                        buf = g_new0( char, strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username ) );
+                        buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->gc->username );
                 }
                 
-                g_snprintf( cmd, sizeof( cmd ), "MSG %d N %d\r\n", ++sb->trId, i );
-                if( msn_sb_write( sb, cmd, strlen( cmd ) ) && msn_sb_write( sb, buf, i ) )
-                {
-                        g_free( buf );
+                /* Build the final packet (MSG command + the message). */
+                packet = g_strdup_printf( "MSG %d N %d\r\n%s", ++sb->trId, i, buf );
+                g_free( buf );
+                if( msn_sb_write( sb, packet, strlen( packet ) ) )
+                {
+                        g_free( packet );
                         return( 1 );
                 }
                 else
                 {
-                        g_free( buf );
+                        g_free( packet );
                         return( 0 );
                 }