Changeset b46769d

Timestamp:

2010-08-12T22:44:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

91d6e91

Parents:

be7a180

Message:

Some syntax checking fixups; don't make the same mistake of failing just if
the MSN server is sending a little bit *more* info.
And adding xt_insert_node() used in the ADL generation code.

Files:

• lib/xmltree.c (modified) (1 diff)
• lib/xmltree.h (modified) (1 diff)
• protocols/msn/ns.c (modified) (6 diffs)
• protocols/msn/sb.c (modified) (6 diffs)

lib/xmltree.c

@@ -550 +550 @@
 }
 
+/* Same, but at the beginning. */
+void xt_insert_child( struct xt_node *parent, struct xt_node *child )
+{
+        struct xt_node *node, *last;
+        
+        for( node = child; node; node = node->next )
+        {
+                if( node->parent != NULL )
+                {
+                        /* ERROR CONDITION: They seem to have a parent already??? */
+                }
+                
+                node->parent = parent;
+                last = node;
+        }
+        
+        last->next = parent->children;
+        parent->children = child;
+}
+
 void xt_add_attr( struct xt_node *node, const char *key, const char *value )
 {

lib/xmltree.h

@@ -92 +92 @@
 struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );
 void xt_add_child( struct xt_node *parent, struct xt_node *child );
+void xt_insert_child( struct xt_node *parent, struct xt_node *child );
 void xt_add_attr( struct xt_node *node, const char *key, const char *value );
 int xt_remove_attr( struct xt_node *node, const char *key );

protocols/msn/ns.c

@@ -228 +228 @@
                 else if( strcmp( cmd[2], "OK" ) == 0 )
                 {
-                        if( num_parts == 7 )
-                                msn_ns_got_display_name( ic, cmd[4] );
-                        else
-                                imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
-                        
                         imcb_log( ic, "Authenticated, getting buddy list" );
-                        
                         msn_soap_memlist_request( ic );
                 }
@@ -246 +240 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts != 4 )
+                if( num_parts < 4 )
                 {
                         imcb_error( ic, "Syntax error" );
@@ -348 +342 @@
                 const struct msn_away_state *st;
                 
-                if( num_parts != 5 )
+                if( num_parts < 5 )
                 {
                         imcb_error( ic, "Syntax error" );
@@ -377 +371 @@
                 int session, port;
                 
-                if( num_parts != 7 )
+                if( num_parts < 7 )
                 {
                         imcb_error( ic, "Syntax error" );
@@ -421 +415 @@
         else if( strcmp( cmd[0], "ADD" ) == 0 )
         {
-                if( num_parts == 6 && strcmp( cmd[2], "RL" ) == 0 )
+                if( num_parts >= 6 && strcmp( cmd[2], "RL" ) == 0 )
                 {
                         GSList *l;
@@ -485 +479 @@
         else if( strcmp( cmd[0], "REA" ) == 0 )
         {
-                if( num_parts != 5 )
+                if( num_parts < 5 )
                 {
                         imcb_error( ic, "Syntax error" );

protocols/msn/sb.c

@@ -414 +414 @@
         else if( strcmp( cmd[0], "USR" ) == 0 )
         {
-                if( num_parts != 5 )
+                if( num_parts < 5 )
                 {
                         msn_sb_destroy( sb );
@@ -440 +440 @@
                 int num, tot;
                 
-                if( num_parts != 6 )
+                if( num_parts < 6 )
                 {
                         msn_sb_destroy( sb );
@@ -477 +477 @@
         else if( strcmp( cmd[0], "ANS" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -496 +496 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts != 4 || !isdigit( cmd[3][0] ) )
+                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -506 +506 @@
         else if( strcmp( cmd[0], "JOI" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -567 +567 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts != 4 )
+                if( num_parts < 4 )
                 {
                         msn_sb_destroy( sb );