Changes in / [934dddf3:d301872]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• account.c (modified) (3 diffs)
• account.h (modified) (2 diffs)
• bitlbee.c (modified) (6 diffs)
• bitlbee.h (modified) (2 diffs)
• conf.c (modified) (1 diff)
• configure (modified) (6 diffs)
• doc/BUILD.win32 (deleted)
• doc/user-guide/commands.xml (modified) (1 diff)
• ipc.c (modified) (8 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (3 diffs)
• irc_commands.c (modified) (1 diff)
• lib/misc.c (modified) (3 diffs)
• lib/ssl_bogus.c (modified) (1 diff)
• lib/ssl_sspi.c (deleted)
• protocols/msn/msn.c (modified) (6 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (1 diff)
• sock.h (modified) (1 diff)
• storage_text.c (modified) (1 diff)
• storage_xml.c (modified) (5 diffs)
• unix.c (modified) (5 diffs)
• win32.c (deleted)

.bzrignore

@@ -19 +19 @@
 coverage
 bitlbee.info
-bitlbee.exe

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
-
-ifeq ($(TARGET),i586-mingw32msvc)
-objects += win32.o
-LFLAGS+=-lws2_32
-EFLAGS+=-lsecur32
-OUTFILE=bitlbee.exe
-else
-objects += unix.o conf.o log.o
-OUTFILE=bitlbee
-endif
 
 # Expansion of variables

account.c

@@ -79 +79 @@
                 return NULL;
         
-        if( strcmp( set->key, "server" ) == 0 )
-        {
-                g_free( acc->server );
-                if( value && *value )
-                {
-                        acc->server = g_strdup( value );
-                        return value;
-                }
-                else
-                {
-                        acc->server = NULL;
-                        return g_strdup( set->def );
-                }
-        }
-        else if( value == NULL )
-        {
-                /* Noop, the other three can't be NULL. */
-        }
-        else if( strcmp( set->key, "username" ) == 0 )
+        if( strcmp( set->key, "username" ) == 0 )
         {
                 g_free( acc->user );
@@ -108 +90 @@
                 acc->pass = g_strdup( value );
                 return NULL;    /* password shouldn't be visible in plaintext! */
+        }
+        else if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( *value )
+                {
+                        acc->server = g_strdup( value );
+                        return value;
+                }
+                else
+                {
+                        acc->server = NULL;
+                        return g_strdup( set->def );
+                }
         }
         else if( strcmp( set->key, "auto_connect" ) == 0 )
@@ -238 +234 @@
         }
 }
-
-struct account_reconnect_delay
-{
-        int start;
-        char op;
-        int step;
-        int max;
-};
-
-int account_reconnect_delay_parse( char *value, struct account_reconnect_delay *p )
-{
-        memset( p, 0, sizeof( *p ) );
-        /* A whole day seems like a sane "maximum maximum". */
-        p->max = 86400;
-        
-        /* Format: /[0-9]+([*+][0-9]+(<[0-9+]))/ */
-        while( *value && isdigit( *value ) )
-                p->start = p->start * 10 + *value++ - '0';
-        
-        /* Sure, call me evil for implementing my own fscanf here, but it's
-           dead simple and I'm immediately at the next part to parse. */
-        
-        if( *value == 0 )
-                /* If the string ends now, the delay is constant. */
-                return 1;
-        else if( *value != '+' && *value != '*' )
-                /* Otherwise allow either a + or a * */
-                return 0;
-        
-        p->op = *value++;
-        
-        /* + or * the delay by this number every time. */
-        while( *value && isdigit( *value ) )
-                p->step = p->step * 10 + *value++ - '0';
-        
-        if( *value == 0 )
-                /* Use the default maximum (one day). */
-                return 1;
-        else if( *value != '<' )
-                return 0;
-        
-        p->max = 0;
-        value ++;
-        while( *value && isdigit( *value ) )
-                p->max = p->max * 10 + *value++ - '0';
-        
-        return p->max > 0;
-}
-
-char *set_eval_account_reconnect_delay( set_t *set, char *value )
-{
-        struct account_reconnect_delay p;
-        
-        return account_reconnect_delay_parse( value, &p ) ? value : NULL;
-}
-
-int account_reconnect_delay( account_t *a )
-{
-        char *setting = set_getstr( &a->irc->set, "auto_reconnect_delay" );
-        struct account_reconnect_delay p;
-        
-        if( account_reconnect_delay_parse( setting, &p ) )
-        {
-                if( a->auto_reconnect_delay == 0 )
-                        a->auto_reconnect_delay = p.start;
-                else if( p.op == '+' )
-                        a->auto_reconnect_delay += p.step;
-                else if( p.op == '*' )
-                        a->auto_reconnect_delay *= p.step;
-                
-                if( a->auto_reconnect_delay > p.max )
-                        a->auto_reconnect_delay = p.max;
-        }
-        else
-        {
-                a->auto_reconnect_delay = 0;
-        }
-        
-        return a->auto_reconnect_delay;
-}

account.h

@@ -35 +35 @@
         
         int auto_connect;
-        int auto_reconnect_delay;
         int reconnect;
         
@@ -53 +52 @@
 
 char *set_eval_account( set_t *set, char *value );
-char *set_eval_account_reconnect_delay( set_t *set, char *value );
-int account_reconnect_delay( account_t *a );
 
 #define ACC_SET_NOSAVE          1

bitlbee.c

@@ -118 +118 @@
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
-                ipc_master_load_state( getenv( "_BITLBEE_RESTART_STATE" ) );
+                ipc_master_load_state();
 
         if( global.conf->runmode == RUNMODE_DAEMON || global.conf->runmode == RUNMODE_FORKDAEMON )
                 ipc_master_listen_socket();
         
-#ifndef _WIN32
         if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
         {
@@ -133 +132 @@
                 log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
         }
-#endif
         
         return( 0 );
@@ -142 +140 @@
         if( !irc_new( 0 ) )
                 return( 1 );
+        
+        log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
         
         return( 0 );
@@ -253 +254 @@
         struct sockaddr_in conn_info;
         int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
+        pid_t client_pid = 0;
         
         if( new_socket == -1 )
@@ -260 +262 @@
         }
         
-#ifndef _WIN32
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
-                pid_t client_pid = 0;
                 int fds[2];
                 
@@ -320 +320 @@
         }
         else
-#endif
         {
                 log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );

bitlbee.h

@@ -29 +29 @@
 #define _GNU_SOURCE /* Stupid GNU :-P */
 
-/* Depend on Windows 2000 for now since we need getaddrinfo() */
-#define _WIN32_WINNT 0x0501
-
 #define PACKAGE "BitlBee"
 #define BITLBEE_VERSION "1.2.1"
@@ -51 +48 @@
 #include <stdio.h>
 #include <ctype.h>
-#include <errno.h>
-
 #ifndef _WIN32
 #include <syslog.h>
+#include <errno.h>
 #endif
 

conf.c

@@ -148 +148 @@
                 else if( opt == 'R' )
                 {
-                        /* Backward compatibility; older BitlBees passed this
-                           info using a command-line flag. Allow people to
-                           upgrade from such a version for now. */
-                        setenv( "_BITLBEE_RESTART_STATE", optarg, 0 );
+                        /* We can't load the statefile yet (and should make very sure we do this
+                           only once), so set the filename here and load the state information
+                           when initializing ForkDaemon. (This option only makes sense in that
+                           mode anyway!) */
+                        ipc_master_set_statefile( optarg );
                 }
                 else if( opt == 'u' )

configure

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
 
 msn=1
@@ -110 +109 @@
 PCDIR=$pcdir
 
-TARGET=$target
 ARCH=$arch
 CPU=$cpu
+OUTFILE=bitlbee
 
 DESTDIR=
@@ -135 +134 @@
 EOF
 
-
-
 if [ -n "$target" ]; then
-        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
-        export PKG_CONFIG_LIBDIR
+        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
         PATH=/usr/$target/bin:$PATH
         CC=$target-cc
         LD=$target-ld
-        systemlibdirs="/usr/$target/lib"
-fi
-
+fi
 
 if [ "$debug" = "1" ]; then
@@ -291 +285 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
-elif [ "$ssl" = "sspi" ]; then
-        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -349 +341 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-for i in $systemlibdirs; do
+for i in /lib /usr/lib /usr/local/lib; do
         if [ -f $i/libresolv.a ]; then
                 echo '#define HAVE_RESOLV_A' >> config.h
@@ -509 +501 @@
         echo 'Cygwin is not officially supported.'
 ;;
-Windows )
-;;
 * )
         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'

doc/user-guide/commands.xml

@@ -321 +321 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="auto_reconnect_delay" type="string" scope="global">
-                <default>5*3&lt;900</default>
-
-                <description>
-                        <para>
-                                Tell BitlBee after how many seconds it should attempt to bring a broken IM-connection back up.
-                        </para>
-
-                        <para>
-                                This can be one integer, for a constant delay. One can also set it to something like &quot;10*10&quot;, which means wait for ten seconds on the first reconnect, multiply it by ten on every failure. Once successfully connected, this delay is re-set to the initial value. With &lt; you can give a maximum delay.
+        <bitlbee-setting name="auto_reconnect_delay" type="integer" scope="global">
+                <default>300</default>
+
+                <description>
+                        <para>
+                                Tell BitlBee after how many seconds it should attempt to bring an IM-connection back up after a crash. It's not a good idea to set this value very low, it will cause too much useless traffic when an IM-server is down for a few hours.
                         </para>
 

ipc.c

@@ -33 +33 @@
 
 GSList *child_list = NULL;
+static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -62 +63 @@
 }
 
-static void ipc_master_cmd_deaf( irc_t *data, char **cmd )
-{
-        if( global.conf->runmode == RUNMODE_DAEMON )
-        {
-                b_event_remove( global.listen_watch_source_id );
-                close( global.listen_socket );
-                
-                global.listen_socket = global.listen_watch_source_id = -1;
-        
-                ipc_to_children_str( "OPERMSG :Closed listening socket, waiting "
-                                     "for all users to disconnect." );
-        }
-        else
-        {
-                ipc_to_children_str( "OPERMSG :The DEAF command only works in "
-                                     "normal daemon mode. Try DIE instead." );
-        }
-}
-
 void ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
@@ -116 +98 @@
         { "hello",      0, ipc_master_cmd_client,     0 },
         { "die",        0, ipc_master_cmd_die,        0 },
-        { "deaf",       0, ipc_master_cmd_deaf,       0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "wall",       1, NULL,                      IPC_CMD_TO_CHILDREN },
@@ -460 +441 @@
 }
 
-#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -501 +481 @@
 }
 
+void ipc_master_set_statefile( char *fn )
+{
+        statefile = g_strdup( fn );
+}
+
 
 static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
@@ -521 +506 @@
 }
 
+#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -557 +543 @@
 }
 #else
-int ipc_master_listen_socket()
-{
         /* FIXME: Open named pipe \\.\BITLBEE */
-        return 0;
-}
 #endif
 
-int ipc_master_load_state( char *statefile )
+int ipc_master_load_state()
 {
         struct bitlbee_child *child;
@@ -572 +554 @@
         if( statefile == NULL )
                 return 0;
-        
         fp = fopen( statefile, "r" );
         unlink( statefile );    /* Why do it later? :-) */

ipc.h

@@ -58 +58 @@
 
 char *ipc_master_save_state();
-int ipc_master_load_state( char *statefile );
+void ipc_master_set_statefile( char *fn );
+int ipc_master_load_state();
 int ipc_master_listen_socket();
 

irc.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
-#include "sock.h"
 #include "crypting.h"
 #include "ipc.h"
@@ -139 +138 @@
         set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
         set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
-        set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc );
+        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc );
         set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
@@ -315 +314 @@
         g_free( irc );
         
-        if( global.conf->runmode == RUNMODE_INETD ||
-            global.conf->runmode == RUNMODE_FORKDAEMON ||
-            ( global.conf->runmode == RUNMODE_DAEMON &&
-              global.listen_socket == -1 &&
-              irc_connection_list == NULL ) )
+        if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
                 b_main_quit();
 }

irc_commands.c

@@ -626 +626 @@
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-        { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wall",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

lib/misc.c

@@ -373 +373 @@
 void random_bytes( unsigned char *buf, int count )
 {
-#ifndef _WIN32
         static int use_dev = -1;
         
@@ -423 +422 @@
         
         if( !use_dev )
-#endif
         {
                 int i;
@@ -584 +582 @@
         md5_byte_t pass_md5[16];
         md5_state_t md5_state;
-        int ret = -1, i;
-        
-        if( base64_decode( hash, &pass_dec ) == 21 )
+        int ret, i;
+        
+        if( base64_decode( hash, &pass_dec ) != 21 )
+        {
+                ret = -1;
+        }
+        else
         {
                 md5_init( &md5_state );

lib/ssl_bogus.c

@@ -61 +61 @@
         return GAIM_INPUT_READ;
 }
-
-int ssl_pending( void *conn )
-{
-        return 0;
-}

protocols/msn/msn.c

@@ -113 +113 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -121 +122 @@
         {
                 struct msn_message *m;
+                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -127 +129 @@
                 m->text = g_strdup( message );
                 
-                return msn_sb_write_msg( ic, m );
+                /* FIXME: *CHECK* the reliability of using spare sb's! */
+                if( ( sb = msn_sb_spare( ic ) ) )
+                {
+                        debug( "Trying to use a spare switchboard to message %s", who );
+                        
+                        sb->who = g_strdup( who );
+                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
+                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                        {
+                                /* He/She should join the switchboard soon, let's queue the message. */
+                                sb->msgq = g_slist_append( sb->msgq, m );
+                                return( 1 );
+                        }
+                }
+                
+                debug( "Creating a new switchboard to message %s", who );
+                
+                /* If we reach this line, there was no spare switchboard, so let's make one. */
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                {
+                        g_free( m->who );
+                        g_free( m->text );
+                        g_free( m );
+                        
+                        return( 0 );
+                }
+                
+                /* And queue the message to md. We'll pick it up when the switchboard comes up. */
+                md->msgq = g_slist_append( md->msgq, m );
+                
+                /* FIXME: If the switchboard creation fails, the message will not be sent. */
+                
+                return( 1 );
         }
         
@@ -217 +252 @@
 {
         struct msn_switchboard *sb;
+        struct msn_data *md = ic->proto_data;
+        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -226 +263 @@
         {
                 struct msn_message *m;
+                
+                if( ( sb = msn_sb_spare( ic ) ) )
+                {
+                        debug( "Trying to reuse an existing switchboard as a groupchat with %s", who );
+                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
+                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                                return msn_sb_to_chat( sb );
+                }
+                
+                /* If the stuff above failed for some reason: */
+                debug( "Creating a new switchboard to groupchat with %s", who );
+                
+                /* Request a new switchboard. */
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                        return( 0 );
                 
                 /* Create a magic message. This is quite hackish, but who cares? :-P */
@@ -232 +285 @@
                 m->text = g_strdup( GROUPCHAT_SWITCHBOARD_MESSAGE );
                 
-                msn_sb_write_msg( ic, m );
-
+                /* Queue the magic message and cross your fingers. */
+                md->msgq = g_slist_append( md->msgq, m );
+                
+                /* FIXME: Can I try to return something here already? */
                 return NULL;
         }

protocols/msn/msn.h

@@ -23 +23 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
-
-#ifndef _MSN_H
-#define _MSN_H
 
 /* Some hackish magicstrings to make special-purpose messages/switchboards.
@@ -179 +176 @@
 void msn_sb_destroy( struct msn_switchboard *sb );
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
-int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
-
-#endif //_MSN_H

protocols/msn/ns.c

@@ -278 +278 @@
                 if( num_parts == 5 )
                 {
-                        int i, groupcount;
-                        
-                        groupcount = atoi( cmd[4] );
-                        if( groupcount > 0 )
-                        {
-                                /* valgrind says this is leaking memory, I'm guessing
-                                   that this happens during server redirects. */
-                                if( md->grouplist )
-                                {
-                                        for( i = 0; i < md->groupcount; i ++ )
-                                                g_free( md->grouplist[i] );
-                                        g_free( md->grouplist );
-                                }
-                                
-                                md->groupcount = groupcount;
+                        md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
                                 md->grouplist = g_new0( char *, md->groupcount );
-                        }
-                        
-                        md->buddycount = atoi( cmd[3] );
+                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );
@@ -679 +665 @@
                                         imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
-                                
-                                g_free( inbox );
-                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )

protocols/msn/sb.c

@@ -44 +44 @@
                 return( 0 );
         }
-        
-        return( 1 );
-}
-
-int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m )
-{
-        struct msn_data *md = ic->proto_data;
-        struct msn_switchboard *sb;
-        char buf[1024];
-
-        /* FIXME: *CHECK* the reliability of using spare sb's! */
-        if( ( sb = msn_sb_spare( ic ) ) )
-        {
-                debug( "Trying to use a spare switchboard to message %s", m->who );
-                
-                sb->who = g_strdup( m->who );
-                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, m->who );
-                if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                {
-                        /* He/She should join the switchboard soon, let's queue the message. */
-                        sb->msgq = g_slist_append( sb->msgq, m );
-                        return( 1 );
-                }
-        }
-        
-        debug( "Creating a new switchboard to message %s", m->who );
-        
-        /* If we reach this line, there was no spare switchboard, so let's make one. */
-        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
-        {
-                g_free( m->who );
-                g_free( m->text );
-                g_free( m );
-                
-                return( 0 );
-        }
-        
-        /* And queue the message to md. We'll pick it up when the switchboard comes up. */
-        md->msgq = g_slist_append( md->msgq, m );
-        
-        /* FIXME: If the switchboard creation fails, the message will not be sent. */
         
         return( 1 );

protocols/nogaim.c

@@ -267 +267 @@
            protocols. */
         imc_set_away( ic, u->away );
-        
-        /* Apparently we're connected successfully, so reset the
-           exponential backoff timer. */
-        ic->acc->auto_reconnect_delay = 0;
 }
 
@@ -294 +290 @@
         user_t *t, *u;
         account_t *a;
-        int delay;
         
         /* Nested calls might happen sometimes, this is probably the best
@@ -334 +329 @@
         }
         else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
-                 set_getbool( &a->set, "auto_reconnect" ) &&
-                 ( delay = account_reconnect_delay( a ) ) > 0 )
-        {
+                 set_getbool( &a->set, "auto_reconnect" ) )
+        {
+                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
+                
                 imcb_log( ic, "Reconnecting in %d seconds..", delay );
                 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );

protocols/yahoo/libyahoo2.c

@@ -69 +69 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 #endif
 

protocols/yahoo/yahoo.c

@@ -665 +665 @@
         
         imcb_error( ic, "%s", err );
+        
+        if( fatal )
+                imc_logout( ic, TRUE );
 }
 

protocols/yahoo/yahoo_httplib.c

@@ -51 +51 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 # define snprintf _snprintf
 #endif

sock.h

@@ -16 +16 @@
 #else
 # include <winsock2.h>
-# include <ws2tcpip.h>
+# ifndef _MSC_VER
+#  include <ws2tcpip.h>
+# endif
 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
 #   pragma comment(lib,"bitlbee.lib")
 # endif
 # include <io.h>
+# define read(a,b,c) recv(a,b,c,0)
+# define write(a,b,c) send(a,b,c,0)
+# define umask _umask
+# define mode_t int
 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }

storage_text.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "crypting.h"
-#ifdef _WIN32
-# define umask _umask
-# define mode_t int
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
 
 static void text_init (void)

storage_xml.c

@@ -30 +30 @@
 #include "md5.h"
 #include <glib/gstdio.h>
-
-#if GLIB_CHECK_VERSION(2,8,0)
-#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
@@ -252 +244 @@
 static void xml_init( void )
 {
-        if( g_access( global.conf->configdir, F_OK ) != 0 )
+        if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) )
                 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
-        else if( g_access( global.conf->configdir, F_OK ) != 0 || 
-                 g_access( global.conf->configdir, W_OK ) != 0 )
+        else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }
@@ -382 +373 @@
         g_free( path2 );
         
-        if( !overwrite && g_access( path, F_OK ) == 0 )
+        if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) )
                 return STORAGE_ALREADY_EXISTS;
         
@@ -490 +481 @@
 static storage_status_t xml_remove( const char *nick, const char *password )
 {
-        char s[512], *lc;
+        char s[512];
         storage_status_t status;
 
@@ -497 +488 @@
                 return status;
 
-        lc = g_strdup( nick );
-        nick_lc( lc );
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, lc, ".xml" );
-        g_free( lc );
-        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".xml" );
         if( unlink( s ) == -1 )
                 return STORAGE_OTHER_ERROR;

unix.c

@@ -40 +40 @@
 static void sighandler( int signal );
 
-int main( int argc, char *argv[] )
+int main( int argc, char *argv[], char **envp )
 {
         int i = 0;
@@ -60 +60 @@
         if( global.conf->runmode == RUNMODE_INETD )
         {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
-        
                 i = bitlbee_inetd_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
@@ -69 +66 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
-
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
@@ -141 +135 @@
         {
                 char *fn = ipc_master_save_state();
+                char **args;
+                int n, i;
                 
                 chdir( old_cwd );
                 
-                setenv( "_BITLBEE_RESTART_STATE", fn, 1 );
-                g_free( fn );
+                n = 0;
+                args = g_new0( char *, argc + 3 );
+                args[n++] = argv[0];
+                if( fn )
+                {
+                        args[n++] = "-R";
+                        args[n++] = fn;
+                }
+                for( i = 1; argv[i] && i < argc; i ++ )
+                {
+                        if( strcmp( argv[i], "-R" ) == 0 )
+                                i += 2;
+                        
+                        args[n++] = argv[i];
+                }
                 
                 close( global.listen_socket );
                 
-                if( execv( argv[0], argv ) == -1 )
-                        /* Apparently the execve() failed, so let's just
-                           jump back into our own/current main(). */
-                        /* Need more cleanup code to make this work. */
-                        return 1; /* main( argc, argv ); */
+                execve( args[0], args, envp );
         }
         
@@ -214 +219 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
-
-