Changeset 717e3bf

Timestamp:

2007-04-17T03:57:30Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9624fdf

Parents:

b3cae44

Message:

Hopefully improved Yahoo! "markup" stripping.

File:

• protocols/yahoo/yahoo.c (modified) (2 diffs)

protocols/yahoo/yahoo.c

@@ -71 +71 @@
         int len;
         
-        /* This should get rid of HTML tags at the beginning of the string. */
+        /* This should get rid of the markup noise at the beginning of the string. */
         while( *in )
         {
@@ -101 +101 @@
         }
         
-        /* This is supposed to get rid of the closing HTML tags at the end of the line. */
+        /* This is supposed to get rid of the noise at the end of the line. */
         len = strlen( in );
-        while( len > 0 && in[len-1] == '>' )
+        while( len > 0 && ( in[len-1] == '>' || in[len-1] == 'm' ) )
         {
                 int blen = len;
-                
-                len --;
-                while( len > 0 && ( in[len] != '<' || in[len+1] != '/' ) )
+                const char *search;
+                
+                if( in[len-1] == '>' )
+                        search = "</";
+                else
+                        search = "\e[";
+                
+                len -= 3;
+                while( len > 0 && strncmp( in + len, search, 2 ) != 0 )
                         len --;
                 
-                if( len == 0 && ( in[len] != '<' || in[len+1] != '/' ) )
+                if( len <= 0 && strncmp( in, search, 2 ) != 0 )
                 {
                         len = blen;