aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/Makefile3
-rw-r--r--protocols/jabber/Makefile3
-rw-r--r--protocols/msn/Makefile3
-rw-r--r--protocols/msn/sb.c15
-rw-r--r--protocols/oscar/Makefile3
-rw-r--r--protocols/yahoo/Makefile3
6 files changed, 24 insertions, 6 deletions
diff --git a/protocols/Makefile b/protocols/Makefile
index cc45fb09..7f793bc4 100644
--- a/protocols/Makefile
+++ b/protocols/Makefile
@@ -25,6 +25,9 @@ LFLAGS += -r
# [SH] Phony targets
all: protocols.o
+check: all
+gcov:
+ gcov *.c
.PHONY: all clean distclean $(subdirs)
diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
index 9b414dc8..27a29be4 100644
--- a/protocols/jabber/Makefile
+++ b/protocols/jabber/Makefile
@@ -16,6 +16,9 @@ LFLAGS += -r
# [SH] Phony targets
all: jabber_mod.o
+check: all
+gcov:
+ gcov *.c
.PHONY: all clean distclean
diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
index 873c831c..f53b34ba 100644
--- a/protocols/msn/Makefile
+++ b/protocols/msn/Makefile
@@ -16,6 +16,9 @@ LFLAGS += -r
# [SH] Phony targets
all: msn_mod.o
+check: all
+gcov:
+ gcov *.c
.PHONY: all clean distclean
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index 63744cd0..7ec340bd 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -121,9 +121,10 @@ int msn_sb_sendmessage( struct msn_switchboard *sb, char *text )
{
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 )
{
buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 );
@@ -141,19 +142,21 @@ int msn_sb_sendmessage( struct msn_switchboard *sb, char *text )
else
{
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 ) )
+ /* 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( buf );
+ g_free( packet );
return( 1 );
}
else
{
- g_free( buf );
+ g_free( packet );
return( 0 );
}
}
diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile
index 97a27299..ed2d7f83 100644
--- a/protocols/oscar/Makefile
+++ b/protocols/oscar/Makefile
@@ -16,6 +16,9 @@ LFLAGS += -r
# [SH] Phony targets
all: oscar_mod.o
+check: all
+gcov:
+ gcov *.c
.PHONY: all clean distclean
diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile
index b4014f8a..34c3551a 100644
--- a/protocols/yahoo/Makefile
+++ b/protocols/yahoo/Makefile
@@ -16,6 +16,9 @@ LFLAGS += -r
# [SH] Phony targets
all: yahoo_mod.o
+check: all
+gcov:
+ gcov *.c
.PHONY: all clean distclean