Changes in / [e01ff50:f329dfc]
- Files:
-
- 3 deleted
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
re01ff50 rf329dfc 10 10 11 11 # Program variables 12 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) 13 headers = bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/json.h lib/json_util.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/account.h protocols/bee.h protocols/ft.h protocols/nogaim.h12 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o 13 headers = $(wildcard *.h lib/*.h protocols/*.h) 14 14 subdirs = lib protocols 15 15 16 ifeq ($(TARGET),i586-mingw32msvc) 17 objects += win32.o 18 LDFLAGS+=-lws2_32 19 EFLAGS+=-lsecur32 20 OUTFILE=bitlbee.exe 21 else 22 objects += unix.o conf.o log.o 23 OUTFILE=bitlbee 24 endif 16 OUTFILE = bitlbee 25 17 26 18 # Expansion of variables -
bitlbee.c
re01ff50 rf329dfc 127 127 global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL ); 128 128 129 #ifndef _WIN32130 129 if( !global.conf->nofork ) 131 130 { … … 151 150 } 152 151 } 153 #endif154 152 155 153 if( global.conf->runmode == RUNMODE_FORKDAEMON ) … … 159 157 ipc_master_listen_socket(); 160 158 161 #ifndef _WIN32162 159 if( ( fp = fopen( global.conf->pidfile, "w" ) ) ) 163 160 { … … 169 166 log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile ); 170 167 } 171 #endif172 168 173 169 if( !global.conf->nofork ) … … 295 291 } 296 292 297 #ifndef _WIN32298 293 if( global.conf->runmode == RUNMODE_FORKDAEMON ) 299 294 { … … 357 352 } 358 353 else 359 #endif360 354 { 361 355 log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket ); -
bitlbee.h
re01ff50 rf329dfc 35 35 #endif 36 36 37 /* Depend on Windows 2000 for now since we need getaddrinfo() */38 #define _WIN32_WINNT 0x050139 40 37 #define PACKAGE "BitlBee" 41 38 #define BITLBEE_VERSION "3.2.2" … … 60 57 #include <ctype.h> 61 58 #include <errno.h> 62 63 #ifndef _WIN3264 59 #include <syslog.h> 65 #endif66 67 60 #include <glib.h> 68 61 #include <gmodule.h> -
configure
re01ff50 rf329dfc 484 484 elif [ "$ssl" = "nss" ]; then 485 485 detect_nss 486 elif [ "$ssl" = "sspi" ]; then487 echo488 486 elif [ "$ssl" = "openssl" ]; then 489 487 echo … … 608 606 # BI == built-in 609 607 echo '#define OTR_BI' >> config.h 610 echo "EFLAGS+=-L${otrprefix}/lib -lotr " >> Makefile.settings608 echo "EFLAGS+=-L${otrprefix}/lib -lotr -lgcrypt" >> Makefile.settings 611 609 echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings 612 610 echo 'OTR_BI=otr.o' >> Makefile.settings … … 806 804 ;; 807 805 CYGWIN* ) 808 echo 'Cygwin is not officially supported.'809 806 ;; 810 807 Windows ) 808 echo 'Native windows compilation is not supported anymore, use cygwin instead.' 811 809 ;; 812 810 * ) -
help.c
re01ff50 rf329dfc 42 42 *help = h = g_new0 ( help_t, 1 ); 43 43 44 h->fd = open( helpfile, O_RDONLY 45 #ifdef _WIN32 46 | O_BINARY 47 #endif 48 ); 44 h->fd = open( helpfile, O_RDONLY ); 49 45 50 46 if( h->fd == -1 ) -
ipc.c
re01ff50 rf329dfc 28 28 #include "ipc.h" 29 29 #include "commands.h" 30 #ifndef _WIN3231 30 #include <sys/uio.h> 32 31 #include <sys/un.h> 33 #endif34 32 35 33 GSList *child_list = NULL; … … 843 841 } 844 842 845 #ifndef _WIN32846 843 char *ipc_master_save_state() 847 844 { … … 942 939 return 1; 943 940 } 944 #else945 int ipc_master_listen_socket()946 {947 /* FIXME: Open named pipe \\.\BITLBEE */948 return 0;949 }950 #endif951 941 952 942 int ipc_master_load_state( char *statefile ) -
lib/events.h
re01ff50 rf329dfc 37 37 38 38 #include <sys/types.h> 39 #ifndef _WIN3240 39 #include <sys/socket.h> 41 40 #include <netdb.h> 42 41 #include <netinet/in.h> 43 #endif44 42 #include <glib.h> 45 43 #include <gmodule.h> -
lib/events_glib.c
re01ff50 rf329dfc 31 31 #include <string.h> 32 32 #include <sys/types.h> 33 #ifndef _WIN3234 33 #include <sys/socket.h> 35 34 #include <netdb.h> … … 37 36 #include <arpa/inet.h> 38 37 #include <unistd.h> 39 #else40 #include "sock.h"41 #define ETIMEDOUT WSAETIMEDOUT42 #define EINPROGRESS WSAEINPROGRESS43 #endif44 38 #include <fcntl.h> 45 39 #include <errno.h> -
lib/http_client.c
re01ff50 rf329dfc 292 292 293 293 cleanup: 294 /* Avoid g_source_remove warnings */ 295 req->inpa = 0; 296 294 297 if( req->ssl ) 295 298 ssl_disconnect( req->ssl ); -
lib/misc.c
re01ff50 rf329dfc 420 420 void random_bytes( unsigned char *buf, int count ) 421 421 { 422 #ifndef _WIN32423 422 static int use_dev = -1; 424 423 … … 470 469 471 470 if( !use_dev ) 472 #endif473 471 { 474 472 int i; -
lib/proxy.c
re01ff50 rf329dfc 26 26 #include <string.h> 27 27 #include <sys/types.h> 28 #ifndef _WIN3229 28 #include <sys/socket.h> 30 29 #include <netdb.h> … … 32 31 #include <arpa/inet.h> 33 32 #include <unistd.h> 34 #else35 #include "sock.h"36 #define ETIMEDOUT WSAETIMEDOUT37 #define EINPROGRESS WSAEINPROGRESS38 #endif39 33 #include <fcntl.h> 40 34 #include <errno.h> … … 76 70 len = sizeof(error); 77 71 78 #ifndef _WIN3279 72 if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0 || error) { 80 73 if ((phb->gai_cur = phb->gai_cur->ai_next)) { … … 101 94 return FALSE; 102 95 } 103 #endif104 96 freeaddrinfo(phb->gai); 105 97 sock_make_blocking(source); -
lib/proxy.h
re01ff50 rf329dfc 28 28 29 29 #include <sys/types.h> 30 #ifndef _WIN3231 30 #include <sys/socket.h> 32 31 #include <netdb.h> 33 32 #include <netinet/in.h> 34 #endif35 33 #include <glib.h> 36 34 #include <gmodule.h> -
lib/ssl_gnutls.c
re01ff50 rf329dfc 236 236 static void ssl_cache_add( struct scd *conn ) 237 237 { 238 size_t data_size ;238 size_t data_size = 0; 239 239 struct ssl_session *data; 240 240 char *hostname; … … 245 245 246 246 data = g_malloc( sizeof( struct ssl_session ) + data_size ); 247 if( gnutls_session_get_data( conn->session, data->data, &data ->size ) != 0 )247 if( gnutls_session_get_data( conn->session, data->data, &data_size ) != 0 ) 248 248 { 249 249 g_free( data ); … … 335 335 int st, stver; 336 336 337 /* This function returns false, so avoid calling b_event_remove again */ 338 conn->inpa = -1; 339 337 340 if( ( st = gnutls_handshake( conn->session ) ) < 0 ) 338 341 { -
protocols/msn/soap.h
re01ff50 rf329dfc 36 36 #include <string.h> 37 37 #include <sys/types.h> 38 #ifndef _WIN3239 38 #include <sys/socket.h> 40 39 #include <netinet/in.h> 41 40 #include <arpa/inet.h> 42 41 #include <unistd.h> 43 #endif44 42 #include "nogaim.h" 45 43 -
protocols/oscar/rxqueue.c
re01ff50 rf329dfc 9 9 #include <aim.h> 10 10 11 #ifndef _WIN3212 11 #include <sys/socket.h> 13 #endif14 12 15 13 /* -
protocols/oscar/txqueue.c
re01ff50 rf329dfc 9 9 #include "im.h" 10 10 11 #ifndef _WIN3212 11 #include <sys/socket.h> 13 #endif14 12 15 13 /* -
protocols/twitter/twitter.c
re01ff50 rf329dfc 323 323 s = set_add(&acc->set, "show_ids", "true", set_eval_bool, acc); 324 324 325 s = set_add(&acc->set, "show_old_mentions", " 20", set_eval_int, acc);325 s = set_add(&acc->set, "show_old_mentions", "0", set_eval_int, acc); 326 326 327 327 s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc); … … 617 617 618 618 goto eof; 619 } else if (g_strcasecmp(cmd[0], "favourite") == 0 && cmd[1]) { 619 } else if ((g_strcasecmp(cmd[0], "favourite") == 0 || 620 g_strcasecmp(cmd[0], "favorite") == 0 || 621 g_strcasecmp(cmd[0], "fav") == 0) && cmd[1]) { 620 622 if ((id = twitter_message_id_from_command_arg(ic, cmd[1], NULL))) { 621 623 twitter_favourite_tweet(ic, id); -
protocols/yahoo/libyahoo2.c
re01ff50 rf329dfc 48 48 */ 49 49 50 #ifndef _WIN3251 50 #include <unistd.h> 52 #endif53 51 #include <errno.h> 54 52 #include <stdio.h> -
protocols/yahoo/yahoo_httplib.c
re01ff50 rf329dfc 38 38 39 39 #include <errno.h> 40 #ifndef _WIN3241 40 #include <unistd.h> 42 #endif43 41 #include <ctype.h> 44 42 #include "yahoo2.h" -
protocols/yahoo/yahoo_util.h
re01ff50 rf329dfc 65 65 void y_strfreev(char **vector); 66 66 67 #ifndef _WIN3268 67 int strncasecmp(const char *s1, const char *s2, size_t n); 69 68 int strcasecmp(const char *s1, const char *s2); … … 73 72 int snprintf(char *str, size_t size, const char *format, ...); 74 73 int vsnprintf(char *str, size_t size, const char *format, va_list ap); 75 #endif76 74 77 75 #endif -
sock.h
re01ff50 rf329dfc 2 2 #include <fcntl.h> 3 3 4 #ifndef _WIN325 4 #include <unistd.h> 6 5 #include <sys/socket.h> … … 12 11 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR) 13 12 void closesocket( int fd ); 14 #else15 # include <winsock2.h>16 # include <ws2tcpip.h>17 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)18 # pragma comment(lib,"bitlbee.lib")19 # endif20 # include <io.h>21 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }22 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }23 # define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK)24 # define ETIMEDOUT WSAETIMEDOUT25 # define sleep(a) Sleep(a*1000)26 #endif
Note: See TracChangeset
for help on using the changeset viewer.