Changeset 5898ef8

Timestamp:

2006-06-15T12:46:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

10efa91

Parents:

c121f89 (diff), 79e826a (diff), 3af70b0 (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:

xml_save(), decent error handling and merging fixed autosaving.

Files:

• bitlbee.c (modified) (1 diff)
• ipc.c (modified) (5 diffs)
• irc.c (modified) (6 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• root_commands.c (modified) (3 diffs)
• storage_text.c (modified) (2 diffs)
• storage_xml.c (modified) (6 diffs)

bitlbee.c

@@ -228 +228 @@
                 irc->w_watch_source_id = 0;
                 
-                if( irc->status == USTATUS_SHUTDOWN )
+                if( irc->status & USTATUS_SHUTDOWN )
                         irc_free( irc );
                 

ipc.c

@@ -115 +115 @@
 static void ipc_child_cmd_wallops( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -124 +124 @@
 static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -133 +133 @@
 static void ipc_child_cmd_opermsg( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -154 +154 @@
 static void ipc_child_cmd_kill( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 return;
         
@@ -166 +166 @@
 static void ipc_child_cmd_hello( irc_t *irc, char **cmd )
 {
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
                 ipc_to_master_str( "HELLO\r\n" );
         else

irc.c

@@ -177 +177 @@
         }
         
-        irc->status = USTATUS_SHUTDOWN;
+        irc->status |= USTATUS_SHUTDOWN;
         if( irc->sendbuffer && !immed )
         {
@@ -211 +211 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
                 if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
@@ -577 +577 @@
                 
         /* Don't try to write anything new anymore when shutting down. */
-        if( irc->status == USTATUS_SHUTDOWN )
+        if( irc->status & USTATUS_SHUTDOWN )
                 return;
         
@@ -707 +707 @@
         if( irc->user && irc->nick )
         {
-                if( global.conf->authmode == AUTHMODE_CLOSED && irc->status < USTATUS_AUTHORIZED )
+                if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
                 {
                         irc_reply( irc, 464, ":This server is password-protected." );
@@ -764 +764 @@
                 ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
         
-        irc->status = USTATUS_LOGGED_IN;
+        irc->status |= USTATUS_LOGGED_IN;
 }
 
@@ -1187 +1187 @@
         int rv = 0;
         
-        if( irc->status < USTATUS_LOGGED_IN )
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
         {
                 if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )

irc.h

@@ -42 +42 @@
 {
         USTATUS_OFFLINE = 0,
-        USTATUS_AUTHORIZED,
-        USTATUS_LOGGED_IN,
-        USTATUS_IDENTIFIED,
-        USTATUS_SHUTDOWN = -1
+        USTATUS_AUTHORIZED = 1,
+        USTATUS_LOGGED_IN = 2,
+        USTATUS_IDENTIFIED = 4,
+        USTATUS_SHUTDOWN = 8
 } irc_status_t;
 

irc_commands.c

@@ -32 +32 @@
         if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
         {
-                irc->status = USTATUS_AUTHORIZED;
+                irc->status |= USTATUS_AUTHORIZED;
                 irc_check_login( irc );
         }
@@ -610 +610 @@
                         for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
                         
-                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
+                        if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )
                         {
                                 irc_reply( irc, 462, ":Only allowed before logging in" );
                         }
-                        else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
+                        else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) )
                         {
                                 irc_reply( irc, 451, ":Register first" );

protocols/msn/msn.c

@@ -64 +64 @@
         GSList *l;
         
-        if( md->fd >= 0 )
-                closesocket( md->fd );
-        
-        if( md->handler )
-        {
-                if( md->handler->rxq ) g_free( md->handler->rxq );
-                if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
-                g_free( md->handler );
-        }
-        
-        while( md->switchboards )
-                msn_sb_destroy( md->switchboards->data );
-        
-        if( md->msgq )
-        {
-                struct msn_message *m;
-                
-                for( l = md->msgq; l; l = l->next )
-                {
-                        m = l->data;
-                
-                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                }
-                g_slist_free( md->msgq );
+        if( md )
+        {
+                if( md->fd >= 0 )
+                        closesocket( md->fd );
+                
+                if( md->handler )
+                {
+                        if( md->handler->rxq ) g_free( md->handler->rxq );
+                        if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
+                        g_free( md->handler );
+                }
+                
+                while( md->switchboards )
+                        msn_sb_destroy( md->switchboards->data );
+                
+                if( md->msgq )
+                {
+                        struct msn_message *m;
+                        
+                        for( l = md->msgq; l; l = l->next )
+                        {
+                                m = l->data;
+                        
+                                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
+                                g_free( m->who );
+                                g_free( m->text );
+                                g_free( m );
+                        }
+                        g_slist_free( md->msgq );
+                }
+                
+                g_free( md );
         }
         
@@ -100 +105 @@
                 g_free( l->data );
         g_slist_free( gc->deny );
-        
-        g_free( md );
         
         msn_connections = g_slist_remove( msn_connections, gc );

root_commands.c

@@ -164 +164 @@
                         
                 case STORAGE_OK:
-                        irc->status = USTATUS_IDENTIFIED;
+                        irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
                         break;
@@ -188 +188 @@
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
-                irc->status = USTATUS_LOGGED_IN;
+                irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
@@ -202 +202 @@
         account_t *a;
         
-        if( global.conf->authmode == AUTHMODE_REGISTERED && irc->status < USTATUS_IDENTIFIED )
+        if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
         {
                 irc_usermsg( irc, "This server only accepts registered users" );

storage_text.c

@@ -71 +71 @@
         user_t *ru = user_find( irc, ROOT_NICK );
         
-        if( irc->status >= USTATUS_IDENTIFIED )
+        if( irc->status & USTATUS_IDENTIFIED )
                 return( 1 );
         
@@ -88 +88 @@
         /* Do this now. If the user runs with AuthMode = Registered, the
            account command will not work otherwise. */
-        irc->status = USTATUS_IDENTIFIED;
+        irc->status |= USTATUS_IDENTIFIED;
         
         while( fscanf( fp, "%511[^\n]s", s ) > 0 )

storage_xml.c

@@ -169 +169 @@
 static void xml_end_element( GMarkupParseContext *ctx, const gchar *element_name, gpointer data, GError **error )
 {
+        struct xml_parsedata *xd = data;
+        // irc_t *irc = xd->irc;
+        
+        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;
+        }
 }
 
@@ -188 +200 @@
                 xd->current_setting = NULL;
         }
-}
-
-static void xml_error( GMarkupParseContext *ctx, GError *error, gpointer data )
-{
 }
 
@@ -200 +208 @@
         xml_text,
         NULL,
-        xml_error
+        NULL
 };
 
@@ -219 +227 @@
         int fd, st;
         
-        if( irc->status >= USTATUS_IDENTIFIED )
+        if( irc->status & USTATUS_IDENTIFIED )
                 return( 1 );
         
@@ -244 +252 @@
                 {
                         g_markup_parse_context_free( ctx );
+                        close( fd );
                         
-                        /* TODO: Display useful error msg */
-                        
+                        /* Slightly dirty... */
                         if( gerr && strcmp( gerr->message, XML_PASS_ERRORMSG ) == 0 )
                                 return STORAGE_INVALID_PASSWORD;
                         else
+                        {
+                                if( gerr )
+                                        irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
+                                
                                 return STORAGE_OTHER_ERROR;
+                        }
                 }
         }
         
         g_markup_parse_context_free( ctx );
-        
-        irc->status = USTATUS_IDENTIFIED;
+        close( fd );
+        
+        irc->status |= USTATUS_IDENTIFIED;
         
         if( set_getint( irc, "auto_connect" ) )
@@ -268 +282 @@
 }
 
+static int xml_printf( int fd, char *fmt, ... )
+{
+        va_list params;
+        char *out;
+        int len;
+        
+        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 storage_status_t xml_save( irc_t *irc, int overwrite )
 {
-/*      if (!overwrite) {
-                g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-                if (access( path, F_OK ) != -1)
-                        return STORAGE_ALREADY_EXISTS;
-        
-                g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-                if (access( path, F_OK ) != -1)
-                        return STORAGE_ALREADY_EXISTS;
-        }
-*/      
+        char path[512], *path2;
+        set_t *set;
+        nick_t *nick;
+        account_t *acc;
+        int fd;
+        
+        g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, irc->nick, ".xml" );
+        
+        if( !overwrite && access( path, F_OK ) != -1 )
+                return STORAGE_ALREADY_EXISTS;
+        
+        strcat( path, "~" );
+        if( ( fd = open( path, O_WRONLY | O_CREAT, 0600 ) ) < 0 )
+        {
+                irc_usermsg( irc, "Error while opening configuration file." );
+                return STORAGE_OTHER_ERROR;
+        }
+        
+        if( !xml_printf( fd, "<user nick=\"%s\" password=\"%s\">\n", irc->nick, irc->password ) )
+                goto write_error;
+        
+        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 ) )
+                                goto write_error;
+        
+        for( acc = irc->accounts; acc; acc = acc->next )
+        {
+                if( !xml_printf( fd, "\t<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%s\"", acc->prpl->name, acc->user, acc->pass, "yes" ) )
+                        goto write_error;
+                if( acc->server && acc->server[0] && !xml_printf( fd, " server=\"%s\"", acc->server ) )
+                        goto write_error;
+                if( !xml_printf( fd, ">\n" ) )
+                        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 ) )
+                                        goto write_error;
+                
+                if( !xml_printf( fd, "\t</account>\n" ) )
+                        goto write_error;
+        }
+        
+        if( !xml_printf( fd, "</user>\n" ) )
+                goto write_error;
+        
+        close( fd );
+        
+        path2 = g_strndup( path, strlen( path ) - 1 );
+        if( rename( path, path2 ) != 0 )
+        {
+                irc_usermsg( irc, "Error while renaming temporary configuration file." );
+                
+                g_free( path2 );
+                unlink( path );
+                
+                return STORAGE_OTHER_ERROR;
+        }
+        
+        g_free( path2 );
+        
         return STORAGE_OK;
+
+write_error:
+        irc_usermsg( irc, "Write error. Disk full?" );
+        close( fd );
+        
+        return STORAGE_OTHER_ERROR;
 }