Changeset 54794b8

Timestamp:

2006-08-25T12:34:36Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

695e392

Parents:

a36b030

Message:

Added msn_http_encode() so it can be used in msn_buddy_list_add() too.
Most likely fixes #198.

Location:

protocols/msn

Files:

• msn.c (modified) (2 diffs)
• msn.h (modified) (1 diff)
• msn_util.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -212 +212 @@
 static void msn_set_info( struct gaim_connection *gc, char *info )
 {
-        int i;
-        char buf[1024], *fn, *s;
+        char buf[1024], *fn;
         struct msn_data *md = gc->proto_data;
         
@@ -222 +221 @@
         }
         
-        /* Of course we could use http_encode() here, but when we encode
-           every character, the server is less likely to complain about the
-           chosen name. However, the MSN server doesn't seem to like escaped
-           non-ASCII chars, so we keep those unescaped. */
-        s = fn = g_new0( char, strlen( info ) * 3 + 1 );
-        for( i = 0; info[i]; i ++ )
-                if( info[i] & 128 )
-                {
-                        *s = info[i];
-                        s ++;
-                }
-                else
-                {
-                        g_snprintf( s, 4, "%%%02X", info[i] );
-                        s += 3;
-                }
+        fn = msn_http_encode( info );
         
         g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, gc->username, fn );

protocols/msn/msn.h

@@ -157 +157 @@
 char **msn_linesplit( char *line );
 int msn_handler( struct msn_handler_data *h );
+char *msn_http_encode( const char *input );
 
 /* tables.c */

protocols/msn/msn_util.c

@@ -56 +56 @@
         char buf[1024], *realname;
         
-        realname = g_new0( char, strlen( realname_ ) * 3 + 1 );
-        strcpy( realname, realname_ );
-        http_encode( realname );
+        realname = msn_http_encode( realname_ );
         
         g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s\r\n", ++md->trId, list, who, realname );
@@ -315 +313 @@
         return( 1 );
 }
+
+/* The difference between this function and the normal http_encode() function
+   is that this one escapes every 7-bit ASCII character because this is said
+   to avoid some lame server-side checks when setting a real-name. Also,
+   non-ASCII characters are not escaped because MSN servers don't seem to
+   appreciate that! */
+char *msn_http_encode( const char *input )
+{
+        char *ret, *s;
+        int i;
+        
+        ret = s = g_new0( char, strlen( input ) * 3 + 1 );
+        for( i = 0; input[i]; i ++ )
+                if( input[i] & 128 )
+                {
+                        *s = input[i];
+                        s ++;
+                }
+                else
+                {
+                        g_snprintf( s, 4, "%%%02X", input[i] );
+                        s += 3;
+                }
+        
+        return ret;
+}