Changeset d219296 for storage_xml.c

Timestamp:

2012-06-05T19:47:22Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

222b440

Parents:

00f1e93

Message:

Small cleanup of xml_save().

File:

• storage_xml.c (modified) (6 diffs)

storage_xml.c

@@ -174 +174 @@
         struct xt_node *node;
         storage_status_t ret = STORAGE_OTHER_ERROR;
-        char *nick;
         
         xd->irc = irc;
@@ -246 +245 @@
 
 
-static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data );
+static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data );
 
 struct xt_node *xml_generate( irc_t *irc )
@@ -320 +319 @@
                    return TRUE on write errors. Which means, if we found
                    something, there was an error. :-) */
-                g_hash_table_find( acc->nicks, xml_save_nick, cur );
+                g_hash_table_find( acc->nicks, xml_generate_nick, cur );
                 
                 xt_add_child( root, cur );
@@ -352 +351 @@
 static storage_status_t xml_save( irc_t *irc, int overwrite )
 {
-        char path[512], *path2, *xml;
-        struct xt_node *tree;
+        storage_status_t ret = STORAGE_OK;
+        char path[512], *path2 = NULL, *xml = NULL;
+        struct xt_node *tree = NULL;
+        size_t len;
         int fd;
         
         path2 = g_strdup( irc->user->nick );
         nick_lc( path2 );
-        g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" );
+        g_snprintf( path, sizeof( path ) - 20, "%s%s%s", global.conf->configdir, path2, ".xml" );
         g_free( path2 );
         
@@ -373 +374 @@
         tree = xml_generate( irc );
         xml = xt_to_string( tree );
-        write( fd, xml, strlen( xml ) );
-        
-        fsync( fd );
-        close( fd );
+        len = strlen( xml );
+        if( write( fd, xml, len ) != len ||
+            fsync( fd ) != 0 || /* #559 */
+            close( fd ) != 0 )
+                goto error;
         
         path2 = g_strndup( path, strlen( path ) - 7 );
         if( rename( path, path2 ) != 0 )
         {
-                irc_rootmsg( irc, "Error while renaming temporary configuration file." );
-                
                 g_free( path2 );
-                unlink( path );
-                
-                return STORAGE_OTHER_ERROR;
-        }
-        
+                goto error;
+        }
         g_free( path2 );
         
-        return STORAGE_OK;
-
-write_error:
-        
+        goto finish;
+
+error:
         irc_rootmsg( irc, "Write error. Disk full?" );
+        ret = STORAGE_OTHER_ERROR;
+
+finish: 
         close( fd );
-        
-        return STORAGE_OTHER_ERROR;
-}
-
-static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data )
+        unlink( path );
+        g_free( xml );
+        xt_free_node( tree );
+        
+        return ret;
+}
+
+static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data )
 {
         struct xt_node *node = xt_new_node( "buddy", NULL, NULL );
@@ -410 +412 @@
         return FALSE;
 }
+
 
 static storage_status_t xml_remove( const char *nick, const char *password )