Changeset df1694b

Timestamp:

2006-06-25T12:15:42Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7ed3199

Parents:

812a413

Message:

Moving all generic files to lib/ instead of having some in / and some in
protocols/, and adding RC4 code.

Files:

• Makefile (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (1 diff)
• configure (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/Makefile (added)
• lib/events.h (moved) (moved from protocols/events.h)
• lib/events_glib.c (moved) (moved from protocols/events_glib.c)
• lib/events_libevent.c (moved) (moved from protocols/events_libevent.c)
• lib/http_client.c (moved) (moved from protocols/http_client.c)
• lib/http_client.h (moved) (moved from protocols/http_client.h)
• lib/ini.c (moved) (moved from ini.c)
• lib/ini.h (moved) (moved from ini.h)
• lib/md5.c (moved) (moved from protocols/md5.c)
• lib/md5.h (moved) (moved from protocols/md5.h)
• lib/misc.c (moved) (moved from util.c)
• lib/misc.h (moved) (moved from util.h)
• lib/proxy.c (moved) (moved from protocols/proxy.c)
• lib/proxy.h (moved) (moved from protocols/proxy.h)
• lib/rc4.c (added)
• lib/rc4.h (added)
• lib/sha.c (moved) (moved from protocols/sha.c)
• lib/sha.h (moved) (moved from protocols/sha.h)
• lib/ssl_bogus.c (moved) (moved from protocols/ssl_bogus.c)
• lib/ssl_client.h (moved) (moved from protocols/ssl_client.h)
• lib/ssl_gnutls.c (moved) (moved from protocols/ssl_gnutls.c)
• lib/ssl_nss.c (moved) (moved from protocols/ssl_nss.c)
• lib/ssl_openssl.c (moved) (moved from protocols/ssl_openssl.c)
• lib/url.c (moved) (moved from url.c)
• lib/url.h (moved) (moved from url.h)
• protocols/Makefile (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-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 storage_xml.o unix.o url.o user.o util.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_text.o storage_xml.o unix.o user.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
+subdirs = protocols lib
 
 objects += $(LDAP_OBJ)

bitlbee.h

@@ -130 +130 @@
 #include "query.h"
 #include "sock.h"
-#include "util.h"
+#include "misc.h"
 #include "proxy.h"
 

conf.c

@@ -34 +34 @@
 #include "ipc.h"
 
-#include "protocols/proxy.h"
+#include "proxy.h"
 
 char *CONF_FILE;

configure

@@ -144 +144 @@
 fi
 
-echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings

irc_commands.c

@@ -321 +321 @@
 {
         user_t *u;
-        char buff[IRC_MAX_LINE], *s;
+        char buff[IRC_MAX_LINE];
         int lenleft, i;
         

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
+objects = nogaim.o
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))