Changes in / [601e813:fc630f9]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (2 diffs)
• configure (modified) (2 diffs)
• doc/BUILD.win32 (deleted)
• protocols/nogaim.h (modified) (1 diff)
• protocols/ssl_sspi.c (deleted)
• sock.h (modified) (2 diffs)
• storage_text.c (modified) (1 diff)
• unix.c (modified) (2 diffs)
• 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

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o storage_text.o url.o user.o util.o
+objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
 subdirs = protocols
-
-ifeq ($(ARCH),Windows)
-objects += win32.o
-else
-objects += unix.o conf.o log.o
-endif
 
 # Expansion of variables

bitlbee.c

@@ -141 +141 @@
                 return( 1 );
         
+        log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+        
         return( 0 );
 }

bitlbee.h

@@ -48 +48 @@
 #include <stdio.h>
 #include <ctype.h>
-#include <errno.h>
-
 #ifndef _WIN32
 #include <syslog.h>
+#include <errno.h>
 #endif
 
@@ -76 +75 @@
 #undef strncasecmp
 #define strncasecmp     __PLEASE_USE_G_STRNCASECMP_INSTEAD__
+
+#ifndef F_OK
+#define F_OK 0
+#endif
 
 #define _( x ) x

configure

@@ -64 +64 @@
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
---ssl=...       SSL library to use (gnutls, nss, openssl, sspi, bogus, auto)
+--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
 EOF
@@ -231 +231 @@
         elif [ "$ssl" = "nss" ]; then
                 detect_nss;
-        elif [ "$ssl" = "sspi" ]; then
-                echo
         elif [ "$ssl" = "openssl" ]; then
                 echo

protocols/nogaim.h

@@ -139 +139 @@
 };
 
-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 {
         int options;

sock.h

@@ -21 +21 @@
 #else
 # include <winsock2.h>
+# ifndef _MSC_VER
+#  include <ws2tcpip.h>
+# endif
 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
 #   pragma comment(lib,"bitlbee.lib")
@@ -27 +30 @@
 # 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
 
 /* DO NOT USE THIS FUNCTION IN NEW CODE. This 

unix.c

@@ -64 +64 @@
         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 );
@@ -73 +70 @@
         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 );