Changes in lib/misc.c [ffdf2e7:f5da476]

File:

• lib/misc.c (modified) (6 diffs)

lib/misc.c

@@ -157 +157 @@
         char *s = out, *cs;
         int i, matched;
+        int taglen;
         
         memset( out, 0, sizeof( out ) );
@@ -173 +174 @@
                                 in ++;
                         
+                        taglen = in - cs - 1;   /* not <0 because the above loop runs at least once */
                         if( *in )
                         {
-                                if( g_strncasecmp( cs+1, "br", 2) == 0 )
+                                if( g_strncasecmp( cs+1, "b", taglen) == 0 )
+                                        *(s++) = '\x02';
+                                else if( g_strncasecmp( cs+1, "/b", taglen) == 0 )
+                                        *(s++) = '\x02';
+                                else if( g_strncasecmp( cs+1, "i", taglen) == 0 )
+                                        *(s++) = '\x1f';
+                                else if( g_strncasecmp( cs+1, "/i", taglen) == 0 )
+                                        *(s++) = '\x1f';
+                                else if( g_strncasecmp( cs+1, "br", taglen) == 0 )
                                         *(s++) = '\n';
                                 in ++;
@@ -298 +308 @@
 void http_encode( char *s )
 {
-        char *t;
+        char t[strlen(s)+1];
         int i, j;
         
-        t = g_strdup( s );
-        
+        strcpy( t, s );
         for( i = j = 0; t[i]; i ++, j ++ )
         {
@@ -320 +329 @@
         }
         s[j] = 0;
-        
-        g_free( t );
 }
 
@@ -393 +400 @@
         cd = g_iconv_open( to_cs, from_cs );
         if( cd == (GIConv) -1 )
-                return( -1 );
+                return -1;
         
         inbytesleft = size ? size : strlen( src );
@@ -401 +408 @@
         g_iconv_close( cd );
         
-        if( res == (size_t) -1 )
-                return( -1 );
+        if( res != 0 )
+                return -1;
         else
-                return( outbuf - dst );
+                return outbuf - dst;
 }