Changes in / [85d7b85:dd34575]


Ignore:
Files:
5 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r85d7b85 rdd34575  
    22config.h
    33bitlbee
    4 Debug
    5 Debugx
    6 deps
    7 admin/Debug
    8 admin/admin.plg
    9 bitlbee.plg
    10 *.plg
    11 *.aps
    12 *.clw
    134user-guide.txt
    145user-guide.html
  • Makefile

    r85d7b85 rdd34575  
    1010
    1111# Program variables
    12 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
     12objects = 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
    1313headers = 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
    1414subdirs = lib protocols
    15 
    16 ifeq ($(ARCH),Windows)
    17 objects += win32.o
    18 else
    19 objects += unix.o conf.o log.o
    20 endif
    2115
    2216# Expansion of variables
  • bitlbee.c

    r85d7b85 rdd34575  
    123123                ipc_master_listen_socket();
    124124       
    125 #ifndef _WIN32
    126125        if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
    127126        {
     
    133132                log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
    134133        }
    135 #endif
    136134       
    137135        return( 0 );
     
    142140        if( !irc_new( 0 ) )
    143141                return( 1 );
     142       
     143        log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
     144        log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
    144145       
    145146        return( 0 );
     
    249250        struct sockaddr_in conn_info;
    250251        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
     252        pid_t client_pid = 0;
    251253       
    252254        if( new_socket == -1 )
     
    256258        }
    257259       
    258 #ifndef _WIN32
    259260        if( global.conf->runmode == RUNMODE_FORKDAEMON )
    260261        {
    261                 pid_t client_pid = 0;
    262262                int fds[2];
    263263               
     
    316316        }
    317317        else
    318 #endif
    319318        {
    320319                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
  • bitlbee.h

    r85d7b85 rdd34575  
    4848#include <stdio.h>
    4949#include <ctype.h>
    50 #include <errno.h>
    51 
    5250#ifndef _WIN32
    5351#include <syslog.h>
     52#include <errno.h>
    5453#endif
    5554
  • configure

    r85d7b85 rdd34575  
    7474--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    7575                                                        $ssl
    76 --arch=...  Override target architecture $arch
    77 
    7876EOF
    7977                exit;
     
    269267elif [ "$ssl" = "nss" ]; then
    270268        detect_nss
    271 elif [ "$ssl" = "sspi" ]; then
    272         echo
    273269elif [ "$ssl" = "openssl" ]; then
    274270        echo
     
    487483        echo 'Cygwin is not officially supported.'
    488484;;
    489 Windows )
    490         echo OUTFILE=bitlbee.exe >> Makefile.settings
    491         echo LFLAGS+=-lwsock32 >> Makefile.settings
    492         echo EFLAGS+=-lsecur32 >> Makefile.settings
    493 ;;
    494485* )
    495486        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
  • ipc.c

    r85d7b85 rdd34575  
    439439}
    440440
    441 #ifndef _WIN32
    442441char *ipc_master_save_state()
    443442{
     
    505504}
    506505
     506#ifndef _WIN32
    507507int ipc_master_listen_socket()
    508508{
     
    541541}
    542542#else
    543 int ipc_master_listen_socket()
    544 {
    545543        /* FIXME: Open named pipe \\.\BITLBEE */
    546         return 0;
    547 }
    548544#endif
    549545
  • protocols/nogaim.h

    r85d7b85 rdd34575  
    130130        struct im_connection *ic; /* the connection it belongs to */
    131131};
    132 
    133 struct ft
    134 {
    135         const char *filename;
    136        
    137         /* Total number of bytes in file */
    138         size_t total_bytes;
    139        
    140         /* Current number of bytes received */
    141         size_t cur_bytes;
    142 };
    143 
    144 struct ft_request
    145 {
    146         const char *filename;
    147         struct gaim_connection *gc;
    148 };
    149 
    150 typedef void (*ft_recv_handler) (struct ft *, void *data, size_t len);
    151132
    152133struct prpl {
  • protocols/oscar/AUTHORS

    r85d7b85 rdd34575  
    2828E: awwaiid@auk.cx
    2929D: Figured out original password roasting
     30
     31
  • protocols/yahoo/libyahoo2.c

    r85d7b85 rdd34575  
    6969#ifdef __MINGW32__
    7070# include <winsock2.h>
     71# define write(a,b,c) send(a,b,c,0)
     72# define read(a,b,c)  recv(a,b,c,0)
    7173#endif
    7274
  • protocols/yahoo/yahoo_httplib.c

    r85d7b85 rdd34575  
    5151#ifdef __MINGW32__
    5252# include <winsock2.h>
     53# define write(a,b,c) send(a,b,c,0)
     54# define read(a,b,c)  recv(a,b,c,0)
    5355# define snprintf _snprintf
    5456#endif
  • sock.h

    r85d7b85 rdd34575  
    1616#else
    1717# include <winsock2.h>
    18 # ifdef IPV6
     18# ifndef _MSC_VER
    1919#  include <ws2tcpip.h>
    2020# endif
     
    2323# endif
    2424# include <io.h>
     25# define read(a,b,c) recv(a,b,c,0)
     26# define write(a,b,c) send(a,b,c,0)
     27# define umask _umask
     28# define mode_t int
    2529# define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
    2630# define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }
  • storage_text.c

    r85d7b85 rdd34575  
    2727#include "bitlbee.h"
    2828#include "crypting.h"
    29 #ifdef _WIN32
    30 # define umask _umask
    31 # define mode_t int
    32 #endif
    33 
    34 #ifndef F_OK
    35 #define F_OK 0
    36 #endif
    3729
    3830static void text_init (void)
  • unix.c

    r85d7b85 rdd34575  
    6060        if( global.conf->runmode == RUNMODE_INETD )
    6161        {
    62                 log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
    63                 log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
    64        
    6562                i = bitlbee_inetd_init();
    6663                log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
     
    6966        else if( global.conf->runmode == RUNMODE_DAEMON )
    7067        {
    71                 log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
    72                 log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
    73 
    7468                i = bitlbee_daemon_init();
    7569                log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
Note: See TracChangeset for help on using the changeset viewer.