Changes in / [f5d1b31:cd63d58]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (6 diffs)
• bitlbee.h (modified) (2 diffs)
• configure (modified) (6 diffs)
• doc/BUILD.win32 (deleted)
• ipc.c (modified) (3 diffs)
• irc.c (modified) (1 diff)
• lib/misc.c (modified) (2 diffs)
• lib/ssl_bogus.c (modified) (1 diff)
• lib/ssl_sspi.c (deleted)
• protocols/yahoo/libyahoo2.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) (2 diffs)
• unix.c (modified) (3 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

bitlbee.c

@@ -123 +123 @@
                 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
 

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.'

ipc.c

@@ -460 +460 @@
 }
 
-#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -521 +520 @@
 }
 
+#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -557 +557 @@
 }
 #else
-int ipc_master_listen_socket()
-{
         /* FIXME: Open named pipe \\.\BITLBEE */
-        return 0;
-}
 #endif
 

irc.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
-#include "sock.h"
 #include "crypting.h"
 #include "ipc.h"

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;

lib/ssl_bogus.c

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

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_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)
-/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
-#define g_access access
-#endif
 
 typedef enum
@@ -251 +246 @@
         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_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || 
-                         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 );
 }

unix.c

@@ -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 );
@@ -214 +208 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
-
-