Changeset eb6df6a for storage_xml.c

Timestamp:

2010-07-11T17:21:21Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

be999a5

Parents:

3759849 (diff), 00540d4 (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:

merge with upstraem bitlbee 1.2.8

File:

• storage_xml.c (modified) (6 diffs)

storage_xml.c

@@ -60 +60 @@
         char *given_pass;
         xml_pass_st pass_st;
+        int unknown_tag;
 };
 
@@ -87 +88 @@
         irc_t *irc = xd->irc;
         
-        if( g_strcasecmp( element_name, "user" ) == 0 )
+        if( xd->unknown_tag > 0 )
+        {
+                xd->unknown_tag ++;
+        }
+        else if( g_strcasecmp( element_name, "user" ) == 0 )
         {
                 char *nick = xml_attr( attr_names, attr_values, "nick" );
@@ -225 +230 @@
         else
         {
+                xd->unknown_tag ++;
+                irc_usermsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
+                                  "This may happen when downgrading BitlBee versions. "
+                                  "This tag will be skipped and the information will be lost "
+                                  "once you save your settings.", element_name );
+                /*
                 g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
                              "Unkown element: %s", element_name );
+                */
         }
 }
@@ -234 +246 @@
         struct xml_parsedata *xd = data;
         
-        if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
+        if( xd->unknown_tag > 0 )
+        {
+                xd->unknown_tag --;
+        }
+        else if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
         {
                 g_free( xd->current_setting );
@@ -404 +420 @@
                 return STORAGE_ALREADY_EXISTS;
         
-        strcat( path, "~" );
-        if( ( fd = open( path, O_WRONLY | O_CREAT | O_TRUNC, 0600 ) ) < 0 )
+        strcat( path, ".XXXXXX" );
+        if( ( fd = mkstemp( path ) ) < 0 )
         {
                 irc_usermsg( irc, "Error while opening configuration file." );
@@ -499 +515 @@
         close( fd );
         
-        path2 = g_strndup( path, strlen( path ) - 1 );
+        path2 = g_strndup( path, strlen( path ) - 7 );
         if( rename( path, path2 ) != 0 )
         {