Changeset 5100caa for storage_xml.c

Timestamp:

2006-07-01T15:52:05Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fef6116

Parents:

0a3c243

Message:

Added "account set" command.

File:

• storage_xml.c (modified) (8 diffs)

storage_xml.c

@@ -157 +157 @@
                         xd->current_account = account_add( irc, prpl, handle, password );
                         if( server )
-                                xd->current_account->server = g_strdup( server );
+                                set_setstr( &xd->current_account->set, "server", server );
                         if( autoconnect )
-                                /* Return value doesn't matter, since account_add() already sets
-                                   a default! */
-                                sscanf( autoconnect, "%d", &xd->current_account->auto_connect );
+                                set_setstr( &xd->current_account->set, "auto_connect", autoconnect );
                 }
                 else
@@ -176 +174 @@
         else if( g_strcasecmp( element_name, "setting" ) == 0 )
         {
-                if( xd->current_account == NULL )
-                {
-                        char *setting;
-                        
-                        if( xd->current_setting )
-                        {
-                                g_free( xd->current_setting );
-                                xd->current_setting = NULL;
-                        }
-                        
-                        if( ( setting = xml_attr( attr_names, attr_values, "name" ) ) )
-                                xd->current_setting = g_strdup( setting );
-                        else
-                                g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                             "Missing attributes for %s element", element_name );
-                }
+                char *setting;
+                
+                if( xd->current_setting )
+                {
+                        g_free( xd->current_setting );
+                        xd->current_setting = NULL;
+                }
+                
+                if( ( setting = xml_attr( attr_names, attr_values, "name" ) ) )
+                        xd->current_setting = g_strdup( setting );
+                else
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Missing attributes for %s element", element_name );
         }
         else if( g_strcasecmp( element_name, "buddy" ) == 0 )
@@ -243 +238 @@
                    yet. */
         }
-        else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 &&
-                 xd->current_setting && xd->current_account == NULL )
-        {
-                set_setstr( &irc->set, xd->current_setting, (char*) text );
+        else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting )
+        {
+                set_setstr( xd->current_account ? &xd->current_account->set : &irc->set,
+                            xd->current_setting, (char*) text );
                 g_free( xd->current_setting );
                 xd->current_setting = NULL;
@@ -348 +343 @@
 }
 
-static int xml_printf( int fd, char *fmt, ... )
+static int xml_printf( int fd, int indent, char *fmt, ... )
 {
         va_list params;
         char *out;
+        char tabs[9] = "\t\t\t\t\t\t\t\t";
         int len;
+        
+        /* Maybe not very clean, but who needs more than 8 levels of indentation anyway? */
+        if( write( fd, tabs, indent <= 8 ? indent : 8 ) != indent )
+                return 0;
         
         va_start( params, fmt );
@@ -404 +404 @@
         pass_buf = base64_encode( (char*) pass_md5, 21 );
         
-        if( !xml_printf( fd, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
+        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
                 goto write_error;
         
@@ -411 +411 @@
         for( set = irc->set; set; set = set->next )
                 if( set->value && set->def )
-                        if( !xml_printf( fd, "\t<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
+                        if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                 goto write_error;
         
@@ -423 +423 @@
                 g_free( pass_rc4 );
                 
-                if( !xml_printf( fd, "\t<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )
+                if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )
                 {
                         g_free( pass_b64 );
@@ -430 +430 @@
                 g_free( pass_b64 );
                 
-                if( acc->server && acc->server[0] && !xml_printf( fd, " server=\"%s\"", acc->server ) )
+                if( acc->server && acc->server[0] && !xml_printf( fd, 0, " server=\"%s\"", acc->server ) )
                         goto write_error;
-                if( !xml_printf( fd, ">\n" ) )
+                if( !xml_printf( fd, 0, ">\n" ) )
                         goto write_error;
+                
+                for( set = acc->set; set; set = set->next )
+                        if( set->value && set->def && !( set->flags & ACC_SET_NOSAVE ) )
+                                if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
+                                        goto write_error;
                 
                 for( nick = irc->nicks; nick; nick = nick->next )
                         if( nick->proto == acc->prpl )
-                                if( !xml_printf( fd, "\t\t<buddy handle=\"%s\" nick=\"%s\" />\n", nick->handle, nick->nick ) )
+                                if( !xml_printf( fd, 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", nick->handle, nick->nick ) )
                                         goto write_error;
                 
-                if( !xml_printf( fd, "\t</account>\n" ) )
+                if( !xml_printf( fd, 1, "</account>\n" ) )
                         goto write_error;
         }
         
-        if( !xml_printf( fd, "</user>\n" ) )
+        if( !xml_printf( fd, 0, "</user>\n" ) )
                 goto write_error;