diff -r 37fea90808dd include/h.h --- a/include/h.h Sun May 19 08:36:49 2013 +0000 +++ b/include/h.h Sun May 19 02:52:58 2013 -0600 @@ -152,8 +152,6 @@ extern Membership *find_membership_link(Membership *lp, aChannel *ptr); extern Member *find_member_link(Member *, aClient *); extern void remove_user_from_channel(aClient *, aChannel *); -extern char *base64enc(long); -extern long base64dec(char *); extern void add_server_to_table(aClient *); extern void remove_server_from_table(aClient *); extern void iNAH_host(aClient *sptr, char *host); @@ -510,7 +508,6 @@ extern char *Auth_Make(short type, char *para); extern int Auth_CheckError(ConfigEntry *ce); -extern long xbase64dec(char *b64); extern int is_chanownprotop(aClient *cptr, aChannel *chptr); extern int is_skochanop(aClient *cptr, aChannel *chptr); extern char *make_virthost(aClient *sptr, char *curr, char *new, int mode); @@ -542,7 +539,6 @@ extern void read_motd(const char *filename, aMotdFile *motd); /* s_serv.c */ extern CMD_FUNC(m_server_remote); extern void send_proto(aClient *, ConfigItem_link *); -extern char *xbase64enc(long i); extern void unload_all_modules(void); extern int set_blocking(int fd); extern void set_sock_opts(int fd, aClient *cptr); diff -r 37fea90808dd src/aln.c --- a/src/aln.c Sun May 19 08:36:49 2013 +0000 +++ b/src/aln.c Sun May 19 02:52:58 2013 -0600 @@ -31,39 +31,16 @@ #include "version.h" #endif -#include -#include -#include -#include #include #ifdef _WIN32 #include #endif -#include #ifndef STANDALONE #include "h.h" #include "proto.h" ID_Copyright("(C) Carsten Munk 2000"); #endif -static inline char *int_to_base64(long); -static inline long base64_to_int(char *); - - -char *base64enc(long i) -{ - if (i < 0) - return ("0"); - return int_to_base64(i); -} - -long base64dec(char *b64) -{ - if (b64) - return base64_to_int(b64); - else - return 0; -} aClient *find_server_quick_search(char *name) { @@ -95,80 +72,3 @@ cptr = (aClient *)find_server_quick_search(name); return cptr; } - -/* ':' and '#' and '&' and '+' and '@' must never be in this table. */ -/* these tables must NEVER CHANGE! >) */ -char int6_to_base64_map[] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', - 'E', 'F', - 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', - 'U', 'V', - 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', - 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '{', '}' -}; - -char base64_to_int6_map[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, - -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, - -1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, -1, 63, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 -}; - -static inline char *int_to_base64(long val) -{ - /* 32/6 == max 6 bytes for representation, - * +1 for the null, +1 for byte boundaries - */ - static char base64buf[8]; - long i = 7; - - base64buf[i] = '\0'; - - /* Temporary debugging code.. remove before 2038 ;p. - * This might happen in case of 64bit longs (opteron/ia64), - * if the value is then too large it can easily lead to - * a buffer underflow and thus to a crash. -- Syzop - */ - if (val > 2147483647L) - { - abort(); - } - - do - { - base64buf[--i] = int6_to_base64_map[val & 63]; - } - while (val >>= 6); - - return base64buf + i; -} - -static inline long base64_to_int(char *b64) -{ - int v = base64_to_int6_map[(u_char)*b64++]; - - if (!b64) - return 0; - - while (*b64) - { - v <<= 6; - v += base64_to_int6_map[(u_char)*b64++]; - } - - return v; -} diff -r 37fea90808dd src/ircsprintf.c --- a/src/ircsprintf.c Sun May 19 08:36:49 2013 +0000 +++ b/src/ircsprintf.c Sun May 19 02:52:58 2013 -0600 @@ -30,8 +30,6 @@ #include /* *INDENT-OFF* */ -extern char *base64enc(long i); - const char atoi_tab[4000] = { '0','0','0',0, '0','0','1',0, '0','0','2',0, '0','0','3',0, '0','0','4',0, '0','0','5',0, '0','0','6',0, '0','0','7',0, '0','0','8',0, '0','0','9',0, @@ -329,43 +327,6 @@ *str++ = *ap; continue; } -#if 0 /* Not used */ - if (c == 'N') /* Prints "%03u" a numeric value in the - range [ 0, 999 ], padded with zero's */ - { - unsigned int v1; - const char *ap; - v1 = va_arg(vl, unsigned int); - ap = atoi_tab + (v1 << 2); - *str++ = *ap++; - *str++ = *ap++; - *str++ = *ap; - continue; - } -#endif - /* Send base64 value */ - - if (c == 'b') - { - long v1; - char *ap; - - v1 = va_arg(vl, long); - for (ap = (char *) base64enc(v1); *ap; ap++) - *str++ = *ap; - continue; - } - if (c == 'B') - { - long v1; - char *ap; - - v1 = va_arg(vl, long); - *str++ = '!'; - for (ap = (char *) base64enc(v1); *ap; ap++) - *str++ = *ap; - continue; - } if (c == 'd') { diff -r 37fea90808dd src/modules/m_mode.c --- a/src/modules/m_mode.c Sun May 19 08:36:49 2013 +0000 +++ b/src/modules/m_mode.c Sun May 19 02:52:58 2013 -0600 @@ -2382,10 +2382,7 @@ if ((parc < 3) || BadPtr(parv[2])) return 0; - if (*parv[1] == '!') - chants = (TS) base64dec(parv[1] + 1); - else - chants = (TS) atol(parv[1]); + chants = (TS) atol(parv[1]); /* Now, try to find the channel in question */ chptr = find_channel(parv[2], NullChn);