Changeset 5f40da7 for protocols/msn/msn_util.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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 oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• protocols/msn/msn_util.c (modified) (1 diff)

protocols/msn/msn_util.c

@@ -226 +226 @@
                     bu->handle, bu->fullname );
         imcb_ask( bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
-}
-
-char *msn_findheader( char *text, char *header, int len )
-{
-        int hlen = strlen( header ), i;
-        char *ret;
-        
-        if( len == 0 )
-                len = strlen( text );
-        
-        i = 0;
-        while( ( i + hlen ) < len )
-        {
-                /* Maybe this is a bit over-commented, but I just hate this part... */
-                if( g_strncasecmp( text + i, header, hlen ) == 0 )
-                {
-                        /* Skip to the (probable) end of the header */
-                        i += hlen;
-                        
-                        /* Find the first non-[: \t] character */
-                        while( i < len && ( text[i] == ':' || text[i] == ' ' || text[i] == '\t' ) ) i ++;
-                        
-                        /* Make sure we're still inside the string */
-                        if( i >= len ) return( NULL );
-                        
-                        /* Save the position */
-                        ret = text + i;
-                        
-                        /* Search for the end of this line */
-                        while( i < len && text[i] != '\r' && text[i] != '\n' ) i ++;
-                        
-                        /* Make sure we're still inside the string */
-                        if( i >= len ) return( NULL );
-                        
-                        /* Copy the found data */
-                        return( g_strndup( ret, text + i - ret ) );
-                }
-                
-                /* This wasn't the header we were looking for, skip to the next line. */
-                while( i < len && ( text[i] != '\r' && text[i] != '\n' ) ) i ++;
-                while( i < len && ( text[i] == '\r' || text[i] == '\n' ) ) i ++;
-                
-                /* End of headers? */
-                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
-                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
-                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
-                {
-                        break;
-                }
-        }
-        
-        return( NULL );
 }