Changes in / [d179921d:5f5d433]

Files:

• .bzrignore (modified) (2 diffs)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (6 diffs)
• bitlbee.h (modified) (1 diff)
• configure (modified) (5 diffs)
• doc/BUILD.win32 (deleted)
• ipc.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/AUTHORS (modified) (1 diff)
• protocols/ssl_sspi.c (deleted)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (1 diff)
• sock.h (modified) (2 diffs)
• storage_text.c (modified) (1 diff)
• unix.c (modified) (2 diffs)
• utils/cross-compile.win32 (deleted)
• win32.c (deleted)
• win32.mk (deleted)

.bzrignore

@@ -2 +2 @@
 config.h
 bitlbee
-Debug
-Debugx
-deps
-admin/Debug
-admin/admin.plg
-bitlbee.plg
-*.plg
-*.aps
-*.clw
 user-guide.txt
 user-guide.html
@@ -26 +17 @@
 *.gcno
 *.o
-coverage
-bitlbee.info

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 ($(ARCH),Windows)
-objects += win32.o
-else
-objects += unix.o conf.o log.o
-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 );
@@ -249 +250 @@
         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 )
@@ -256 +258 @@
         }
         
-#ifndef _WIN32
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
-                pid_t client_pid = 0;
                 int fds[2];
                 
@@ -316 +316 @@
         }
         else
-#endif
         {
                 log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );

bitlbee.h

@@ -48 +48 @@
 #include <stdio.h>
 #include <ctype.h>
-#include <errno.h>
-
 #ifndef _WIN32
 #include <syslog.h>
+#include <errno.h>
 #endif
 

configure

@@ -74 +74 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
---arch=...  Override target architecture $arch
-
 EOF
                 exit;
@@ -215 +213 @@
 detect_gnutls()
 {
-        if $PKG_CONFIG --exists gnutls; then
-                cat <<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs gnutls`
-CFLAGS+=`$PKG_CONFIG --cflags gnutls`
-EOF
-                ssl=gnutls
-                ret=1
-        elif libgnutls-config --version > /dev/null 2> /dev/null; then
+        if libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
 EFLAGS+=`libgnutls-config --libs`
@@ -276 +267 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
-elif [ "$ssl" = "sspi" ]; then
-        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -386 +375 @@
 
 if [ "$gcov" = "1" ]; then
-        echo "CFLAGS+=--coverage" >> Makefile.settings
-        echo "EFLAGS+=--coverage" >> Makefile.settings
+        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
+        echo "EFLAGS+=-lgcov" >> Makefile.settings
 fi
 
@@ -494 +483 @@
         echo 'Cygwin is not officially supported.'
 ;;
-Windows )
-        echo OUTFILE=bitlbee.exe >> Makefile.settings
-        echo LFLAGS+=-lwsock32 >> Makefile.settings
-        echo EFLAGS+=-lsecur32 >> Makefile.settings
-;;
 * )
         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'

ipc.c

@@ -439 +439 @@
 }
 
-#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -505 +504 @@
 }
 
+#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -541 +541 @@
 }
 #else
-int ipc_master_listen_socket()
-{
         /* FIXME: Open named pipe \\.\BITLBEE */
-        return 0;
-}
 #endif
 

protocols/nogaim.h

@@ -130 +130 @@
         struct im_connection *ic; /* the connection it belongs to */
 };
-
-struct ft 
-{
-        const char *filename;
-        
-        /* Total number of bytes in file */
-        size_t total_bytes;
-        
-        /* Current number of bytes received */
-        size_t cur_bytes;
-};
-
-struct ft_request 
-{
-        const char *filename;
-        struct gaim_connection *gc;
-};
-
-typedef void (*ft_recv_handler) (struct ft *, void *data, size_t len);
 
 struct prpl {

protocols/oscar/AUTHORS

@@ -28 +28 @@
 E: awwaiid@auk.cx
 D: Figured out original password roasting
+
+

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>
-# ifdef IPV6
+# ifndef _MSC_VER
 #  include <ws2tcpip.h>
 # endif
@@ -23 +23 @@
 # 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)

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 );