Changeset e31e5b8

Timestamp:

2013-04-20T13:05:55Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd95ce4

Parents:

9b2a8c1 (diff), bfafb99 (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 "storage" branch which I wrote long ago. It separates generation of
XML-formatted user configs from disk I/O so we can try to start using other
mechanisms to store them (a REST API or something, for example).

Files:

• bitlbee.c (modified) (1 diff)
• configure (modified) (3 diffs)
• doc/bitlbee.schema (deleted)
• lib/xmltree.c (modified) (4 diffs)
• lib/xmltree.h (modified) (1 diff)
• protocols/account.c (modified) (2 diffs)
• protocols/account.h (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/skype/skype.c (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• set.h (modified) (1 diff)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)
• storage_ldap.c (deleted)
• storage_xml.c (modified) (8 diffs)

bitlbee.c

@@ -267 +267 @@
         if( st == size )
         {
-                if( irc->status & USTATUS_SHUTDOWN )
-                {
-                        irc_free( irc );
-                }
-                else
-                {
-                        g_free( irc->sendbuffer );
-                        irc->sendbuffer = NULL;
-                        irc->w_watch_source_id = 0;
-                }
+                g_free( irc->sendbuffer );
+                irc->sendbuffer = NULL;
+                irc->w_watch_source_id = 0;
                 
                 return FALSE;

configure

@@ -39 +39 @@
 
 events=glib
-ldap=0
 ssl=auto
 
@@ -325 +324 @@
                 ret=0;
         fi;
-}
-
-detect_ldap()
-{
-        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
-        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
-                cat<<EOF>>Makefile.settings
-EFLAGS+=-lldap
-CFLAGS+=
-EOF
-                ldap=1
-                rm -f $TMPFILE
-                ret=1
-        else
-                ldap=0
-                ret=0
-        fi
 }
 
@@ -457 +439 @@
 STORAGES="xml"
 
-if [ "$ldap" = "auto" ]; then
-        detect_ldap
-fi
-
-if [ "$ldap" = 0 ]; then
-        echo "#undef WITH_LDAP" >> config.h
-elif [ "$ldap" = 1 ]; then
-        echo
-        echo 'LDAP support is a work in progress and does NOT work AT ALL right now.'
-        echo
-        exit 1
-        
-        echo "#define WITH_LDAP 1" >> config.h
-        STORAGES="$STORAGES ldap"
-fi
-
 for i in $STORAGES; do
         STORAGE_OBJS="$STORAGE_OBJS storage_$i.o"

lib/xmltree.c

@@ -282 +282 @@
 }
 
-static void xt_to_string_real( struct xt_node *node, GString *str )
+static void xt_to_string_real( struct xt_node *node, GString *str, int indent )
 {
         char *buf;
@@ -288 +288 @@
         int i;
         
+        if( indent > 1 )
+                g_string_append_len( str, "\n\t\t\t\t\t\t\t\t",
+                                     indent < 8 ? indent : 8 );
+        
         g_string_append_printf( str, "<%s", node->name );
         
@@ -312 +316 @@
         
         for( c = node->children; c; c = c->next )
-                xt_to_string_real( c, str );
+                xt_to_string_real( c, str, indent ? indent + 1 : 0 );
+        
+        if( indent > 0 && node->children )
+                g_string_append_len( str, "\n\t\t\t\t\t\t\t\t",
+                                     indent < 8 ? indent : 8 );
         
         g_string_append_printf( str, "</%s>", node->name );
@@ -320 +328 @@
 {
         GString *ret;
-        char *real;
         
         ret = g_string_new( "" );
-        xt_to_string_real( node, ret );
-        
-        real = ret->str;
-        g_string_free( ret, FALSE );
-        
-        return real;
+        xt_to_string_real( node, ret, 0 );
+        return g_string_free( ret, FALSE );
+}
+
+/* WITH indentation! */
+char *xt_to_string_i( struct xt_node *node )
+{
+        GString *ret;
+        
+        ret = g_string_new( "" );
+        xt_to_string_real( node, ret, 1 );
+        return g_string_free( ret, FALSE );
 }
 
 void xt_print( struct xt_node *node )
 {
-        int i;
-        struct xt_node *c;
-        
-        /* Indentation */
-        for( c = node; c->parent; c = c->parent )
-                fprintf( stderr, "    " );
-        
-        /* Start the tag */
-        fprintf( stderr, "<%s", node->name );
-        
-        /* Print the attributes */
-        for( i = 0; node->attr[i].key; i ++ )
-        {
-                char *v = g_markup_escape_text( node->attr[i].value, -1 );
-                fprintf( stderr, " %s=\"%s\"", node->attr[i].key, v );
-                g_free( v );
-        }
-        
-        /* /> in case there's really *nothing* inside this tag, otherwise
-           just >. */
-        /* If this tag doesn't have any content at all... */
-        if( node->text == NULL && node->children == NULL )
-        {
-                fprintf( stderr, "/>\n" );
-                return;
-                /* Then we're finished! */
-        }
-        
-        /* Otherwise... */
-        fprintf( stderr, ">" );
-        
-        /* Only print the text if it contains more than whitespace (TEST). */
-        if( node->text_len > 0 )
-        {
-                for( i = 0; node->text[i] && isspace( node->text[i] ); i ++ );
-                if( node->text[i] )
-                {
-                        char *v = g_markup_escape_text( node->text, -1 );
-                        fprintf( stderr, "%s", v );
-                        g_free( v );
-                }
-        }
-        
-        if( node->children )
-                fprintf( stderr, "\n" );
-        
-        for( c = node->children; c; c = c->next )
-                xt_print( c );
-        
-        if( node->children )
-                for( c = node; c->parent; c = c->parent )
-                        fprintf( stderr, "    " );
-        
-        /* Non-empty tag is now finished. */
-        fprintf( stderr, "</%s>\n", node->name );
+        char *str = xt_to_string_i( node );
+        fprintf( stderr, "%s", str );
+        g_free( str );
 }
 

lib/xmltree.h

@@ -84 +84 @@
 struct xt_node *xt_from_string( const char *in, int text_len );
 char *xt_to_string( struct xt_node *node );
+char *xt_to_string_i( struct xt_node *node );
 void xt_print( struct xt_node *node );
 struct xt_node *xt_dup( struct xt_node *node );

protocols/account.c

@@ -53 +53 @@
         
         s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= SET_NOSAVE;
         
         s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
@@ -61 +61 @@
         
         s = set_add( &a->set, "nick_source", "handle", set_eval_nick_source, a );
-        s->flags |= ACC_SET_NOSAVE; /* Just for bw compatibility! */
+        s->flags |= SET_NOSAVE; /* Just for bw compatibility! */
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
+        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
         
         s = set_add( &a->set, "tag", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= SET_NOSAVE;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         set_setstr( &a->set, "username", user );
         

protocols/account.h

@@ -61 +61 @@
 typedef enum
 {
-        ACC_SET_NOSAVE = 0x01,          /* Don't save this setting (i.e. stored elsewhere). */
         ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
         ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */

protocols/jabber/jabber.c

@@ -80 +80 @@
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         
         s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );

protocols/msn/msn.c

@@ -39 +39 @@
         
         s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
         
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );

protocols/oscar/oscar.c

@@ -378 +378 @@
                     icq ? AIM_DEFAULT_LOGIN_SERVER_ICQ
                         : AIM_DEFAULT_LOGIN_SERVER_AIM, set_eval_account, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
         if (icq) {

protocols/skype/skype.c

@@ -1561 +1561 @@
         s = set_add(&acc->set, "display_name", NULL, skype_set_display_name,
                 acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
@@ -1567 +1567 @@
 
         s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "balance", NULL, skype_set_balance, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "skypeout_offline", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -39 +39 @@
 #include <ctype.h>
 #include <errno.h>
-
-/* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
-/* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
-#if !GLIB_CHECK_VERSION(2,12,5)
-#include <stdlib.h>
-#include <limits.h>
-#define g_ascii_strtoll strtoll
-#endif
 
 #define TXL_STATUS 1

root_commands.c

@@ -281 +281 @@
 {
         if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_rootmsg( irc, "Please create an account first" );
+                irc_rootmsg( irc, "Please create an account first (see \x02help register\x02)" );
         else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
                 irc_rootmsg( irc, "Configuration saved" );

set.h

@@ -45 +45 @@
 typedef enum
 {
-        SET_NOSAVE = 0x0001,
-        SET_NULL_OK = 0x0100,
-        SET_HIDDEN = 0x0200,
-        SET_PASSWORD = 0x0400,
-        SET_HIDDEN_DEFAULT = 0x0800,
+        SET_NOSAVE = 0x0001,   /* Don't save this setting (i.e. stored elsewhere). */
+        SET_NULL_OK = 0x0100,  /* set->value == NULL is allowed. */
+        SET_HIDDEN = 0x0200,   /* Don't show up in setting lists. Mostly for internal storage. */
+        SET_PASSWORD = 0x0400, /* Value shows up in settings list as "********". */
+        SET_HIDDEN_DEFAULT = 0x0800, /* Hide unless changed from default. */
 } set_flags_t;
 

storage.c

@@ -195 +195 @@
         return ret;
 }
-
-#if 0
-Not using this yet. Test thoroughly before adding UI hooks to this function.
-
-storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
-{
-        storage_status_t status;
-        GList *gl = global.storage;
-        storage_t *primary_storage = gl->data;
-        irc_t *irc;
-
-        /* First, try to rename in the current write backend, assuming onick 
-         * is stored there */
-        status = primary_storage->rename(onick, nnick, password);
-        if (status != STORAGE_NO_SUCH_USER)
-                return status;
-
-        /* Try to load from a migration backend and save to the current backend. 
-         * Explicitly remove the account from the migration backend as otherwise 
-         * it'd still be usable under the old name */
-        
-        irc = g_new0(irc_t, 1);
-        status = storage_load(onick, password, irc);
-        if (status != STORAGE_OK) {
-                irc_free(irc);
-                return status;
-        }
-
-        g_free(irc->nick);
-        irc->nick = g_strdup(nnick);
-
-        status = storage_save(irc, FALSE);
-        if (status != STORAGE_OK) {
-                irc_free(irc);
-                return status;
-        }
-        irc_free(irc);
-
-        storage_remove(onick, password);
-
-        return STORAGE_OK;
-}
-#endif

storage.h

@@ -59 +59 @@
 storage_status_t storage_remove (const char *nick, const char *password);
 
-/* storage_status_t storage_rename (const char *onick, const char *nnick, const char *password); */
-
 void register_storage_backend(storage_t *);
 G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);

storage_xml.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
-
-#if GLIB_CHECK_VERSION(2,8,0)
+#include "xmltree.h"
+
 #include <glib/gstdio.h>
-#else
-/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
-#include <unistd.h>
-#define g_access access
-#endif
 
 typedef enum
@@ -47 +42 @@
 
 /* To make it easier later when extending the format: */
-#define XML_FORMAT_VERSION 1
+#define XML_FORMAT_VERSION "1"
 
 struct xml_parsedata
 {
         irc_t *irc;
-        char *current_setting;
-        account_t *current_account;
-        irc_channel_t *current_channel;
-        set_t **current_set_head;
-        char *given_nick;
+        char given_nick[MAX_NICK_LENGTH+1];
         char *given_pass;
-        xml_pass_st pass_st;
-        int unknown_tag;
-};
-
-static char *xml_attr( const gchar **attr_names, const gchar **attr_values, const gchar *key )
-{
-        int i;
-        
-        for( i = 0; attr_names[i]; i ++ )
-                if( g_strcasecmp( attr_names[i], key ) == 0 )
-                        return (char*) attr_values[i];
-        
-        return NULL;
-}
-
-static void xml_destroy_xd( gpointer data )
-{
-        struct xml_parsedata *xd = data;
-        
-        g_free( xd->given_nick );
-        g_free( xd->given_pass );
-        g_free( xd );
-}
-
-static void xml_start_element( GMarkupParseContext *ctx, const gchar *element_name, const gchar **attr_names, const gchar **attr_values, gpointer data, GError **error )
-{
-        struct xml_parsedata *xd = data;
-        irc_t *irc = xd->irc;
-        
-        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" );
-                char *pass = xml_attr( attr_names, attr_values, "password" );
-                int st;
-                
-                if( !nick || !pass )
-                {
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Missing attributes for %s element", element_name );
-                }
-                else if( ( st = md5_verify_password( xd->given_pass, pass ) ) == -1 )
-                {
-                        xd->pass_st = XML_PASS_WRONG;
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Error while decoding password attribute" );
-                }
-                else if( st == 0 )
-                {
-                        if( xd->pass_st != XML_PASS_CHECK_ONLY )
-                                xd->pass_st = XML_PASS_OK;
-                }
-                else
-                {
-                        xd->pass_st = XML_PASS_WRONG;
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Password mismatch" );
-                }
-        }
-        else if( xd->pass_st < XML_PASS_OK )
-        {
-                /* Let's not parse anything else if we only have to check
-                   the password. */
-        }
-        else if( g_strcasecmp( element_name, "account" ) == 0 )
-        {
-                char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag;
-                char *pass_b64 = NULL;
-                unsigned char *pass_cr = NULL;
-                int pass_len;
-                struct prpl *prpl = NULL;
-                
-                handle = xml_attr( attr_names, attr_values, "handle" );
-                pass_b64 = xml_attr( attr_names, attr_values, "password" );
-                server = xml_attr( attr_names, attr_values, "server" );
-                autoconnect = xml_attr( attr_names, attr_values, "autoconnect" );
-                tag = xml_attr( attr_names, attr_values, "tag" );
-                
-                protocol = xml_attr( attr_names, attr_values, "protocol" );
-                if( protocol )
-                        prpl = find_protocol( protocol );
-                
-                if( !handle || !pass_b64 || !protocol )
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Missing attributes for %s element", element_name );
-                else if( !prpl )
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Unknown protocol: %s", protocol );
-                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
-                         arc_decode( pass_cr, pass_len, &password, xd->given_pass ) >= 0 )
-                {
-                        xd->current_account = account_add( irc->b, prpl, handle, password );
-                        if( server )
-                                set_setstr( &xd->current_account->set, "server", server );
-                        if( autoconnect )
-                                set_setstr( &xd->current_account->set, "auto_connect", autoconnect );
-                        if( tag )
-                                set_setstr( &xd->current_account->set, "tag", tag );
-                }
-                else
-                {
-                        /* Actually the _decode functions don't even return error codes,
-                           but maybe they will later... */
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Error while decrypting account password" );
-                }
-                
-                g_free( pass_cr );
-                g_free( password );
-        }
-        else if( g_strcasecmp( element_name, "setting" ) == 0 )
-        {
-                char *setting;
-                
-                if( xd->current_setting )
-                {
-                        g_free( xd->current_setting );
-                        xd->current_setting = NULL;
-                }
-                
-                if( ( setting = xml_attr( attr_names, attr_values, "name" ) ) )
-                {
-                        if( xd->current_channel != NULL )
-                                xd->current_set_head = &xd->current_channel->set;
-                        else if( xd->current_account != NULL )
-                                xd->current_set_head = &xd->current_account->set;
-                        else
-                                xd->current_set_head = &xd->irc->b->set;
-                        
-                        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 )
-        {
-                char *handle, *nick;
-                
-                handle = xml_attr( attr_names, attr_values, "handle" );
-                nick = xml_attr( attr_names, attr_values, "nick" );
-                
-                if( xd->current_account && handle && nick )
-                {
-                        nick_set_raw( xd->current_account, handle, nick );
-                }
-                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, "channel" ) == 0 )
-        {
-                char *name, *type;
-                
-                name = xml_attr( attr_names, attr_values, "name" );
-                type = xml_attr( attr_names, attr_values, "type" );
-                
-                if( !name || !type )
-                {
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Missing attributes for %s element", element_name );
-                        return;
-                }
-                
-                /* The channel may exist already, for example if it's &bitlbee.
-                   Also, it's possible that the user just reconnected and the
-                   IRC client already rejoined all channels it was in. They
-                   should still get the right settings. */
-                if( ( xd->current_channel = irc_channel_by_name( irc, name ) ) ||
-                    ( xd->current_channel = irc_channel_new( irc, name ) ) )
-                        set_setstr( &xd->current_channel->set, "type", type );
-        }
-        /* Backward compatibility: Keep this around for a while for people
-           switching from BitlBee 1.2.4+. */
-        else if( g_strcasecmp( element_name, "chat" ) == 0 )
-        {
-                char *handle, *channel;
-                
-                handle = xml_attr( attr_names, attr_values, "handle" );
-                channel = xml_attr( attr_names, attr_values, "channel" );
-                
-                if( xd->current_account && handle && channel )
-                {
-                        irc_channel_t *ic;
-                        
-                        if( ( ic = irc_channel_new( irc, channel ) ) &&
-                            set_setstr( &ic->set, "type", "chat" ) &&
-                            set_setstr( &ic->set, "chat_type", "room" ) &&
-                            set_setstr( &ic->set, "account", xd->current_account->tag ) &&
-                            set_setstr( &ic->set, "room", handle ) )
-                        {
-                                /* Try to pick up some settings where possible. */
-                                xd->current_channel = ic;
-                        }
-                        else if( ic )
-                                irc_channel_free( ic );
-                }
-                else
-                {
-                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                     "Missing attributes for %s element", element_name );
-                }
-        }
-        else
-        {
-                xd->unknown_tag ++;
-                irc_rootmsg( 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 );
-                */
-        }
-}
-
-static void xml_end_element( GMarkupParseContext *ctx, const gchar *element_name, gpointer data, GError **error )
-{
-        struct xml_parsedata *xd = data;
-        
-        if( xd->unknown_tag > 0 )
-        {
-                xd->unknown_tag --;
-        }
-        else if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
-        {
-                g_free( xd->current_setting );
-                xd->current_setting = NULL;
-        }
-        else if( g_strcasecmp( element_name, "account" ) == 0 )
-        {
-                xd->current_account = NULL;
-        }
-        else if( g_strcasecmp( element_name, "channel" ) == 0 ||
-                 g_strcasecmp( element_name, "chat" ) == 0 )
-        {
-                xd->current_channel = NULL;
-        }
-}
-
-static void xml_text( GMarkupParseContext *ctx, const gchar *text_orig, gsize text_len, gpointer data, GError **error )
-{
-        char text[text_len+1];
-        struct xml_parsedata *xd = data;
-        
-        strncpy( text, text_orig, text_len );
-        text[text_len] = 0;
-        
-        if( xd->pass_st < XML_PASS_OK )
-        {
-                /* Let's not parse anything else if we only have to check
-                   the password, or if we didn't get the chance to check it
-                   yet. */
-        }
-        else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting )
-        {
-                if( xd->current_account )
-                {
-                        set_t *s = set_find( xd->current_set_head, xd->current_setting );
-                        if( s && ( s->flags & ACC_SET_ONLINE_ONLY ) )
-                        {
-                                g_free( xd->current_setting );
-                                xd->current_setting = NULL;
-                                return;
-                        }
-                }
-                set_setstr( xd->current_set_head, xd->current_setting, (char*) text );
-                g_free( xd->current_setting );
-                xd->current_setting = NULL;
-        }
-}
-
-GMarkupParser xml_parser =
-{
-        xml_start_element,
-        xml_end_element,
-        xml_text,
-        NULL,
-        NULL
 };
 
@@ -354 +60 @@
 }
 
+static void handle_settings( struct xt_node *node, set_t **head )
+{
+        struct xt_node *c;
+        
+        for( c = node->children; ( c = xt_find_node( c, "setting" ) ); c = c->next )
+        {
+                char *name = xt_find_attr( c, "name" );
+                
+                if( !name )
+                        continue;
+                
+                if( strcmp( node->name, "account" ) == 0 )
+                {
+                        set_t *s = set_find( head, name );
+                        if( s && ( s->flags & ACC_SET_ONLINE_ONLY ) )
+                                continue; /* U can't touch this! */
+                }
+                set_setstr( head, name, c->text );
+        }
+}
+
+static xt_status handle_account( struct xt_node *node, gpointer data )
+{
+        struct xml_parsedata *xd = data;
+        char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag;
+        char *pass_b64 = NULL;
+        unsigned char *pass_cr = NULL;
+        int pass_len;
+        struct prpl *prpl = NULL;
+        account_t *acc;
+        struct xt_node *c;
+        
+        handle = xt_find_attr( node, "handle" );
+        pass_b64 = xt_find_attr( node, "password" );
+        server = xt_find_attr( node, "server" );
+        autoconnect = xt_find_attr( node, "autoconnect" );
+        tag = xt_find_attr( node, "tag" );
+        
+        protocol = xt_find_attr( node, "protocol" );
+        if( protocol )
+                prpl = find_protocol( protocol );
+        
+        if( !handle || !pass_b64 || !protocol || !prpl )
+                return XT_ABORT;
+        else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
+                 arc_decode( pass_cr, pass_len, &password, xd->given_pass ) >= 0 )
+        {
+                acc = account_add( xd->irc->b, prpl, handle, password );
+                if( server )
+                        set_setstr( &acc->set, "server", server );
+                if( autoconnect )
+                        set_setstr( &acc->set, "auto_connect", autoconnect );
+                if( tag )
+                        set_setstr( &acc->set, "tag", tag );
+        }
+        else
+                return XT_ABORT;
+        
+        g_free( pass_cr );
+        g_free( password );
+        
+        handle_settings( node, &acc->set );
+        
+        for( c = node->children; ( c = xt_find_node( c, "buddy" ) ); c = c->next )
+        {
+                char *handle, *nick;
+                
+                handle = xt_find_attr( c, "handle" );
+                nick = xt_find_attr( c, "nick" );
+                
+                if( handle && nick )
+                        nick_set_raw( acc, handle, nick );
+                else
+                        return XT_ABORT;
+        }       
+        return XT_HANDLED;
+}
+
+static xt_status handle_channel( struct xt_node *node, gpointer data )
+{
+        struct xml_parsedata *xd = data;
+        irc_channel_t *ic;
+        char *name, *type;
+        
+        name = xt_find_attr( node, "name" );
+        type = xt_find_attr( node, "type" );
+        
+        if( !name || !type )
+                return XT_ABORT;
+        
+        /* The channel may exist already, for example if it's &bitlbee.
+           Also, it's possible that the user just reconnected and the
+           IRC client already rejoined all channels it was in. They
+           should still get the right settings. */
+        if( ( ic = irc_channel_by_name( xd->irc, name ) ) ||
+            ( ic = irc_channel_new( xd->irc, name ) ) )
+                set_setstr( &ic->set, "type", type );
+        
+        handle_settings( node, &ic->set );
+        
+        return XT_HANDLED;
+}
+
+static const struct xt_handler_entry handlers[] = {
+        { "account", "user", handle_account, },
+        { "channel", "user", handle_channel, },
+        { NULL,      NULL,   NULL, },
+};
+
 static storage_status_t xml_load_real( irc_t *irc, const char *my_nick, const char *password, xml_pass_st action )
 {
-        GMarkupParseContext *ctx;
-        struct xml_parsedata *xd;
-        char *fn, buf[512];
-        GError *gerr = NULL;
+        struct xml_parsedata xd[1];
+        char *fn, buf[2048];
         int fd, st;
-        
-        xd = g_new0( struct xml_parsedata, 1 );
+        struct xt_parser *xp;
+        struct xt_node *node;
+        storage_status_t ret = STORAGE_OTHER_ERROR;
+        
         xd->irc = irc;
-        xd->given_nick = g_strdup( my_nick );
-        xd->given_pass = g_strdup( password );
-        xd->pass_st = action;
+        strncpy( xd->given_nick, my_nick, MAX_NICK_LENGTH );
+        xd->given_nick[MAX_NICK_LENGTH] = '\0';
         nick_lc( xd->given_nick );
-        
-        fn = g_strdup_printf( "%s%s%s", global.conf->configdir, xd->given_nick, ".xml" );
+        xd->given_pass = password;
+        
+        fn = g_strconcat( global.conf->configdir, xd->given_nick, ".xml", NULL );
         if( ( fd = open( fn, O_RDONLY ) ) < 0 )
         {
-                xml_destroy_xd( xd );
-                g_free( fn );
-                return STORAGE_NO_SUCH_USER;
-        }
+                ret = STORAGE_NO_SUCH_USER;
+                goto error;
+        }
+        
+        xp = xt_new( handlers, xd );
+        while( ( st = read( fd, buf, sizeof( buf ) ) ) > 0 )
+        {
+                st = xt_feed( xp, buf, st );
+                if( st != 1 )
+                        break;
+        }
+        close( fd );
+        if( st != 0 )
+                goto error;
+        
+        node = xp->root;
+        if( node == NULL || node->next != NULL || strcmp( node->name, "user" ) != 0 )
+                goto error;
+        
+        {
+                char *nick = xt_find_attr( node, "nick" );
+                char *pass = xt_find_attr( node, "password" );
+                
+                if( !nick || !pass )
+                {
+                        goto error;
+                }
+                else if( ( st = md5_verify_password( xd->given_pass, pass ) ) != 0 )
+                {
+                        ret = STORAGE_INVALID_PASSWORD;
+                        goto error;
+                }
+        }
+        
+        if( action == XML_PASS_CHECK_ONLY )
+        {
+                ret = STORAGE_OK;
+                goto error;
+        }
+        
+        /* DO NOT call xt_handle() before verifying the password! */
+        if( xt_handle( xp, NULL, 1 ) == XT_HANDLED )
+                ret = STORAGE_OK;
+        
+        handle_settings( node, &xd->irc->b->set );
+        
+error:
+        xt_free( xp );
         g_free( fn );
-        
-        ctx = g_markup_parse_context_new( &xml_parser, 0, xd, xml_destroy_xd );
-        
-        while( ( st = read( fd, buf, sizeof( buf ) ) ) > 0 )
-        {
-                if( !g_markup_parse_context_parse( ctx, buf, st, &gerr ) || gerr )
-                {
-                        xml_pass_st pass_st = xd->pass_st;
-                        
-                        g_markup_parse_context_free( ctx );
-                        close( fd );
-                        
-                        if( pass_st == XML_PASS_WRONG )
-                        {
-                                g_clear_error( &gerr );
-                                return STORAGE_INVALID_PASSWORD;
-                        }
-                        else
-                        {
-                                if( gerr && irc )
-                                        irc_rootmsg( irc, "Error from XML-parser: %s", gerr->message );
-                                
-                                g_clear_error( &gerr );
-                                return STORAGE_OTHER_ERROR;
-                        }
-                }
-        }
-        /* Just to be sure... */
-        g_clear_error( &gerr );
-        
-        g_markup_parse_context_free( ctx );
-        close( fd );
-        
-        if( action == XML_PASS_CHECK_ONLY )
-                return STORAGE_OK;
-        
-        return STORAGE_OK;
+        return ret;
 }
 
@@ -423 +246 @@
 static storage_status_t xml_check_pass( const char *my_nick, const char *password )
 {
-        /* This is a little bit risky because we have to pass NULL for the
-           irc_t argument. This *should* be fine, if I didn't miss anything... */
         return xml_load_real( NULL, my_nick, password, XML_PASS_CHECK_ONLY );
 }
 
-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 );
-        out = g_markup_vprintf_escaped( fmt, params );
-        va_end( params );
-        
-        len = strlen( out );
-        len -= write( fd, out, len );
-        g_free( out );
-        
-        return len == 0;
-}
-
-static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data );
-
-static storage_status_t xml_save( irc_t *irc, int overwrite )
-{
-        char path[512], *path2, *pass_buf = NULL;
-        set_t *set;
+
+static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data );
+static void xml_generate_settings( struct xt_node *cur, set_t **head );
+
+struct xt_node *xml_generate( irc_t *irc )
+{
+        char *pass_buf = NULL;
         account_t *acc;
-        int fd;
         md5_byte_t pass_md5[21];
         md5_state_t md5_state;
         GSList *l;
-        
-        path2 = g_strdup( irc->user->nick );
-        nick_lc( path2 );
-        g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" );
-        g_free( path2 );
-        
-        if( !overwrite && g_access( path, F_OK ) == 0 )
-                return STORAGE_ALREADY_EXISTS;
-        
-        strcat( path, ".XXXXXX" );
-        if( ( fd = mkstemp( path ) ) < 0 )
-        {
-                irc_rootmsg( irc, "Error while opening configuration file." );
-                return STORAGE_OTHER_ERROR;
-        }
+        struct xt_node *root, *cur;
         
         /* Generate a salted md5sum of the password. Use 5 bytes for the salt
@@ -488 +273 @@
         pass_buf = base64_encode( pass_md5, 21 );
         
-        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->user->nick, pass_buf, XML_FORMAT_VERSION ) )
-                goto write_error;
+        root = cur = xt_new_node( "user", NULL, NULL );
+        xt_add_attr( cur, "nick", irc->user->nick );
+        xt_add_attr( cur, "password", pass_buf );
+        xt_add_attr( cur, "version", XML_FORMAT_VERSION );
         
         g_free( pass_buf );
         
-        for( set = irc->b->set; set; set = set->next )
-                if( set->value && !( set->flags & SET_NOSAVE ) )
-                        if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
-                                goto write_error;
+        xml_generate_settings( cur, &irc->b->set );
         
         for( acc = irc->b->accounts; acc; acc = acc->next )
@@ -508 +292 @@
                 g_free( pass_cr );
                 
-                if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" "
-                                        "autoconnect=\"%d\" tag=\"%s\"", acc->prpl->name, acc->user,
-                                        pass_b64, acc->auto_connect, acc->tag ) )
-                {
-                        g_free( pass_b64 );
-                        goto write_error;
-                }
+                cur = xt_new_node( "account", NULL, NULL );
+                xt_add_attr( cur, "protocol", acc->prpl->name );
+                xt_add_attr( cur, "handle", acc->user );
+                xt_add_attr( cur, "password", pass_b64 );
+                xt_add_attr( cur, "autoconnect", acc->auto_connect ? "true" : "false" );
+                xt_add_attr( cur, "tag", acc->tag );
+                if( acc->server && acc->server[0] )
+                        xt_add_attr( cur, "server", acc->server );
+                
                 g_free( pass_b64 );
-                
-                if( acc->server && acc->server[0] && !xml_printf( fd, 0, " server=\"%s\"", acc->server ) )
-                        goto write_error;
-                if( !xml_printf( fd, 0, ">\n" ) )
-                        goto write_error;
-                
-                for( set = acc->set; set; set = set->next )
-                        if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
-                                if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
-                                        goto write_error;
                 
                 /* This probably looks pretty strange. g_hash_table_foreach
                    is quite a PITA already (but it can't get much better in
-                   C without using #define, I'm afraid), and since it
+                   C without using #define, I'm afraid), and it
                    doesn't seem to be possible to abort the foreach on write
                    errors, so instead let's use the _find function and
                    return TRUE on write errors. Which means, if we found
                    something, there was an error. :-) */
-                if( g_hash_table_find( acc->nicks, xml_save_nick, & fd ) )
-                        goto write_error;
-                
-                if( !xml_printf( fd, 1, "</account>\n" ) )
-                        goto write_error;
+                g_hash_table_find( acc->nicks, xml_generate_nick, cur );
+                
+                xml_generate_settings( cur, &acc->set );
+                
+                xt_add_child( root, cur );
         }
         
@@ -548 +324 @@
                         continue;
                 
-                if( !xml_printf( fd, 1, "<channel name=\"%s\" type=\"%s\">\n",
-                                 ic->name, set_getstr( &ic->set, "type" ) ) )
-                        goto write_error;
-                
-                for( set = ic->set; set; set = set->next )
-                        if( set->value && strcmp( set->key, "type" ) != 0 )
-                                if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
-                                        goto write_error;
-                
-                if( !xml_printf( fd, 1, "</channel>\n" ) )
-                        goto write_error;
-        }
-        
-        if( !xml_printf( fd, 0, "</user>\n" ) )
-                goto write_error;
-        
-        fsync( fd );
-        close( fd );
+                cur = xt_new_node( "channel", NULL, NULL );
+                xt_add_attr( cur, "name", ic->name );
+                xt_add_attr( cur, "type", set_getstr( &ic->set, "type" ) );
+                
+                xml_generate_settings( cur, &ic->set );
+                
+                xt_add_child( root, cur );
+        }
+        
+        return root;
+}
+
+static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data )
+{
+        struct xt_node *node = xt_new_node( "buddy", NULL, NULL );
+        xt_add_attr( node, "handle", key );
+        xt_add_attr( node, "nick", value );
+        xt_add_child( (struct xt_node *) data, node );
+        
+        return FALSE;
+}
+
+static void xml_generate_settings( struct xt_node *cur, set_t **head )
+{
+        set_t *set;
+        
+        for( set = *head; set; set = set->next )
+                if( set->value && !( set->flags & SET_NOSAVE ) )
+                {
+                        struct xt_node *xset;
+                        xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );
+                        xt_add_attr( xset, "name", set->key );
+                }
+}
+
+static storage_status_t xml_save( irc_t *irc, int overwrite )
+{
+        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 ) - 20, "%s%s%s", global.conf->configdir, path2, ".xml" );
+        g_free( path2 );
+        
+        if( !overwrite && g_access( path, F_OK ) == 0 )
+                return STORAGE_ALREADY_EXISTS;
+        
+        strcat( path, ".XXXXXX" );
+        if( ( fd = mkstemp( path ) ) < 0 )
+        {
+                irc_rootmsg( irc, "Error while opening configuration file." );
+                return STORAGE_OTHER_ERROR;
+        }
+        
+        tree = xml_generate( irc );
+        xml = xt_to_string_i( tree );
+        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:
-        g_free( pass_buf );
-        
+        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 )
-{
-        return !xml_printf( *( (int*) data ), 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", key, value );
-}
+        unlink( path );
+        g_free( xml );
+        xt_free_node( tree );
+        
+        return ret;
+}
+
 
 static storage_status_t xml_remove( const char *nick, const char *password )