Changes in / [178e2f8:e0f9170]


Ignore:
Files:
3 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    r178e2f8 re0f9170  
    1919coverage
    2020bitlbee.info
    21 bitlbee.exe

  • Makefile

    r178e2f8 re0f9170  
    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 ($(TARGET),i586-mingw32msvc)
    17 objects += win32.o
    18 LFLAGS+=-lws2_32
    19 EFLAGS+=-lsecur32
    20 OUTFILE=bitlbee.exe
    21 else
    22 objects += unix.o conf.o log.o
    23 OUTFILE=bitlbee
    24 endif
    2515
    2616# Expansion of variables

  • bitlbee.c

    r178e2f8 re0f9170  
    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 );
    … …  
    253254        struct sockaddr_in conn_info;
    254255        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
     256        pid_t client_pid = 0;
    255257       
    256258        if( new_socket == -1 )
    … …  
    260262        }
    261263       
    262 #ifndef _WIN32
    263264        if( global.conf->runmode == RUNMODE_FORKDAEMON )
    264265        {
    265                 pid_t client_pid = 0;
    266266                int fds[2];
    267267               
    … …  
    320320        }
    321321        else
    322 #endif
    323322        {
    324323                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );

  • bitlbee.h

    r178e2f8 re0f9170  
    2929#define _GNU_SOURCE /* Stupid GNU :-P */
    3030
    31 /* Depend on Windows 2000 for now since we need getaddrinfo() */
    32 #define _WIN32_WINNT 0x0501
    33 
    3431#define PACKAGE "BitlBee"
    3532#define BITLBEE_VERSION "1.2.1"
    … …  
    5148#include <stdio.h>
    5249#include <ctype.h>
    53 #include <errno.h>
    54 
    5550#ifndef _WIN32
    5651#include <syslog.h>
     52#include <errno.h>
    5753#endif
    5854

  • configure

    r178e2f8 re0f9170  
    2020ipcsocket='/var/run/bitlbee.sock'
    2121pcdir='$prefix/lib/pkgconfig'
    22 systemlibdirs="/lib /usr/lib /usr/local/lib"
    2322
    2423msn=1
    … …  
    110109PCDIR=$pcdir
    111110
    112 TARGET=$target
    113111ARCH=$arch
    114112CPU=$cpu
     113OUTFILE=bitlbee
    115114
    116115DESTDIR=
    … …  
    135134EOF
    136135
    137 
    138 
    139136if [ -n "$target" ]; then
    140         PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
    141         export PKG_CONFIG_LIBDIR
     137        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
    142138        PATH=/usr/$target/bin:$PATH
    143139        CC=$target-cc
    144140        LD=$target-ld
    145         systemlibdirs="/usr/$target/lib"
    146 fi
    147 
     141fi
    148142
    149143if [ "$debug" = "1" ]; then
    … …  
    291285elif [ "$ssl" = "nss" ]; then
    292286        detect_nss
    293 elif [ "$ssl" = "sspi" ]; then
    294         echo
    295287elif [ "$ssl" = "openssl" ]; then
    296288        echo
    … …  
    349341echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
    350342
    351 for i in $systemlibdirs; do
     343for i in /lib /usr/lib /usr/local/lib; do
    352344        if [ -f $i/libresolv.a ]; then
    353345                echo '#define HAVE_RESOLV_A' >> config.h
    … …  
    509501        echo 'Cygwin is not officially supported.'
    510502;;
    511 Windows )
    512 ;;
    513503* )
    514504        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'

  • ipc.c

    r178e2f8 re0f9170  
    441441}
    442442
    443 #ifndef _WIN32
    444443char *ipc_master_save_state()
    445444{
    … …  
    507506}
    508507
     508#ifndef _WIN32
    509509int ipc_master_listen_socket()
    510510{
    … …  
    543543}
    544544#else
    545 int ipc_master_listen_socket()
    546 {
    547545        /* FIXME: Open named pipe \\.\BITLBEE */
    548         return 0;
    549 }
    550546#endif
    551547

  • irc.c

    r178e2f8 re0f9170  
    2626#define BITLBEE_CORE
    2727#include "bitlbee.h"
    28 #include "sock.h"
    2928#include "crypting.h"
    3029#include "ipc.h"

  • lib/misc.c

    r178e2f8 re0f9170  
    373373void random_bytes( unsigned char *buf, int count )
    374374{
    375 #ifndef _WIN32
    376375        static int use_dev = -1;
    377376       
    … …  
    423422       
    424423        if( !use_dev )
    425 #endif
    426424        {
    427425                int i;

  • lib/ssl_bogus.c

    r178e2f8 re0f9170  
    6161        return GAIM_INPUT_READ;
    6262}
    63 
    64 int ssl_pending( void *conn )
    65 {
    66         return 0;
    67 }

  • protocols/yahoo/libyahoo2.c

    r178e2f8 re0f9170  
    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

    r178e2f8 re0f9170  
    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

    r178e2f8 re0f9170  
    1616#else
    1717# include <winsock2.h>
    18 # include <ws2tcpip.h>
     18# ifndef _MSC_VER
     19#  include <ws2tcpip.h>
     20# endif
    1921# if !defined(BITLBEE_CORE) && defined(_MSC_VER)
    2022#   pragma comment(lib,"bitlbee.lib")
    2123# endif
    2224# 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
    2329# define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
    2430# define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }

  • storage_text.c

    r178e2f8 re0f9170  
    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

    r178e2f8 re0f9170  
    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 );
    … …  
    225219        return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
    226220}
    227 
    228 
Note: See TracChangeset for help on using the changeset viewer.