Changeset e97827b for protocols/msn/msn_util.c

Timestamp:

2006-10-15T09:31:13Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

69cb623, 93b7bd4

Parents:

3ef6410 (diff), 695e392 (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 from devel.

File:

• protocols/msn/msn_util.c (modified) (4 diffs)

protocols/msn/msn_util.c

@@ -54 +54 @@
 {
         struct msn_data *md = gc->proto_data;
-        GSList *l, **lp = NULL;
         char buf[1024], *realname;
         
-        if( strcmp( list, "AL" ) == 0 )
-                lp = &gc->permit;
-        else if( strcmp( list, "BL" ) == 0 )
-                lp = &gc->deny;
-        
-        if( lp )
-                for( l = *lp; l; l = l->next )
-                        if( g_strcasecmp( l->data, who ) == 0 )
-                                return( 1 );
-        
-        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 );
@@ -76 +63 @@
                 g_free( realname );
                 
-                if( lp )
-                        *lp = g_slist_append( *lp, g_strdup( who ) );
-                
                 return( 1 );
         }
@@ -90 +74 @@
 {
         struct msn_data *md = gc->proto_data;
-        GSList *l = NULL, **lp = NULL;
         char buf[1024];
-        
-        if( strcmp( list, "AL" ) == 0 )
-                lp = &gc->permit;
-        else if( strcmp( list, "BL" ) == 0 )
-                lp = &gc->deny;
-        
-        if( lp )
-        {
-                for( l = *lp; l; l = l->next )
-                        if( g_strcasecmp( l->data, who ) == 0 )
-                                break;
-                
-                if( !l )
-                        return( 1 );
-        }
         
         g_snprintf( buf, sizeof( buf ), "REM %d %s %s\r\n", ++md->trId, list, who );
         if( msn_write( gc, buf, strlen( buf ) ) )
-        {
-                if( lp )
-                        *lp = g_slist_remove( *lp, l->data );
-                
                 return( 1 );
-        }
         
         return( 0 );
@@ -350 +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;
+}