[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Wed Jan 12 07:54:11 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Branch tags: gettext
Commit time: 2011-01-12 13:54:11 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
  Tag: gettext
     configure configure.ac doc/Changes1.8 src/Makefile.in src/cmds.c
     src/dcc.c src/dccutil.c src/dns.c src/main.c src/main.h
     src/misc.c src/modules.c src/net.c src/patch.h src/tcl.c
     src/tclhash.c src/tclmisc.c src/users.c src/compat/Makefile.in
     src/compat/compat.h src/compat/strcasecmp.c src/md5/Makefile.in
     src/md5/md5c.c src/mod/module.h src/mod/assoc.mod/Makefile
     src/mod/blowfish.mod/Makefile src/mod/channels.mod/Makefile
     src/mod/compress.mod/Makefile.in src/mod/compress.mod/compress.c
     src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile
     src/mod/dns.mod/Makefile.in src/mod/dns.mod/coredns.c
     src/mod/dns.mod/dns.c src/mod/filesys.mod/Makefile
     src/mod/filesys.mod/filedb3.c src/mod/irc.mod/Makefile
     src/mod/irc.mod/cmdsirc.c src/mod/irc.mod/irc.c
     src/mod/irc.mod/msgcmds.c src/mod/notes.mod/Makefile
     src/mod/notes.mod/notes.c src/mod/seen.mod/Makefile
     src/mod/server.mod/Makefile src/mod/server.mod/server.c
     src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile
     src/mod/uptime.mod/Makefile src/mod/uptime.mod/uptime.c
     src/mod/woobie.mod/Makefile

Removed files:
  Tag: gettext
     src/compat/gnu_strftime.c src/compat/memcpy.c src/compat/memcpy.h
     src/compat/memset.c src/compat/memset.h src/compat/strftime.c
     src/compat/strftime.h

Log message:

Removed memcpy(), memset() and strftime() compatibility replacements.

---------------------- diff included ----------------------
Index: eggdrop1.8/configure
diff -u eggdrop1.8/configure:1.13 eggdrop1.8/configure:1.13.2.1
--- eggdrop1.8/configure:1.13	Mon Oct 25 16:11:23 2010
+++ eggdrop1.8/configure	Wed Jan 12 07:54:00 2011
@@ -6476,7 +6476,7 @@
 
 
 # Checks for functions and their arguments.
-for ac_func in clock dprintf fsync getdtablesize getrusage inet_aton isascii mbrlen memcpy memset random rand lrand48 rename setpgid sigaction sigemptyset snprintf strcasecmp strncasecmp uname vsnprintf inet_ntop
+for ac_func in clock dprintf fsync getdtablesize getrusage inet_aton isascii mbrlen random rand lrand48 rename setpgid sigaction sigemptyset strcasecmp strncasecmp uname vsnprintf inet_ntop
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6489,6 +6489,24 @@
 fi
 done
 
+for ac_func in memcpy memset strftime
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+
+  as_fn_error "Some of the required library functions is not available. Sorry" "$LINENO" 5
+  exit 1
+
+fi
+done
+
 for ac_header in sys/select.h sys/socket.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
Index: eggdrop1.8/configure.ac
diff -u eggdrop1.8/configure.ac:1.5 eggdrop1.8/configure.ac:1.5.2.1
--- eggdrop1.8/configure.ac:1.5	Tue Oct 19 06:13:32 2010
+++ eggdrop1.8/configure.ac	Wed Jan 12 07:54:00 2011
@@ -1,11 +1,11 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.5 2010/10/19 12:13:32 pseudo Exp $
+dnl $Id: configure.ac,v 1.5.2.1 2011/01/12 13:54:00 pseudo Exp $
 
 AC_PREREQ(2.60)
 AC_INIT([Eggdrop],[1.8.0],[bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2010 Eggheads Development Team])
-AC_REVISION($Revision: 1.5 $)
+AC_REVISION($Revision: 1.5.2.1 $)
 AC_CONFIG_SRCDIR(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
 AC_CONFIG_HEADER(config.h)
@@ -113,10 +113,13 @@
 
 
 # Checks for functions and their arguments.
-AC_CHECK_FUNCS([clock dprintf fsync getdtablesize getrusage inet_aton isascii mbrlen memcpy memset random rand lrand48 rename setpgid sigaction sigemptyset snprintf strcasecmp strncasecmp uname vsnprintf inet_ntop])
+AC_CHECK_FUNCS([clock dprintf fsync getdtablesize getrusage inet_aton isascii mbrlen random rand lrand48 rename setpgid sigaction sigemptyset snprintf strcasecmp strncasecmp uname vsnprintf inet_ntop])
+AC_CHECK_FUNCS([memcpy memset strftime], , [
+  AC_MSG_ERROR([Some of the required library functions is not available. Sorry])
+  exit 1
+])
 AC_FUNC_SELECT_ARGTYPES
 EGG_FUNC_VPRINTF
-AC_FUNC_STRFTIME
 AC_FUNC_MMAP
 
 
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.36.2.7 eggdrop1.8/doc/Changes1.8:1.36.2.8
--- eggdrop1.8/doc/Changes1.8:1.36.2.7	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/doc/Changes1.8	Wed Jan 12 07:54:00 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.36.2.7 2010/11/17 13:58:37 pseudo Exp $
+$Id: Changes1.8,v 1.36.2.8 2011/01/12 13:54:00 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,10 @@
 
 1.8.0 (CVS):
 
+  - Removed memcpy(), memset() and strftime() compatibility replacements.
+    Some of them were broken and all are generally available (C89).
+    Found by: thommey / Patch by: pseudo
+
   - Removed the old lang system.
     Patch by: pseudo
 
Index: eggdrop1.8/src/Makefile.in
diff -u eggdrop1.8/src/Makefile.in:1.2.2.1 eggdrop1.8/src/Makefile.in:1.2.2.2
--- eggdrop1.8/src/Makefile.in:1.2.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/Makefile.in	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/
-# $Id: Makefile.in,v 1.2.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile.in,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -91,127 +91,127 @@
 #safety hash
 bg.o: bg.c main.h ../config.h ../lush.h eggdrop.h flags.h proto.h \
   misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h compat/compat.h \
-  compat/inet_aton.h ../src/main.h compat/snprintf.h compat/memset.h \
-  compat/memcpy.h compat/strcasecmp.h compat/strftime.h bg.h
+  compat/inet_aton.h ../src/main.h compat/snprintf.h \
+  compat/strcasecmp.h bg.h
 botcmd.o: botcmd.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h modules.h mod/modvals.h
 botmsg.o: botmsg.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h
 botnet.o: botnet.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h
 chanprog.o: chanprog.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h
 cmds.o: cmds.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h modules.h mod/modvals.h
 dcc.o: dcc.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h md5/md5.h
 dccutil.o: dccutil.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h
 dns.o: dns.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   dns.h
 flags.o: flags.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 main.o: main.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h bg.h patch.h
 match.o: match.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 mem.o: mem.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   mod/modvals.h
 misc.o: misc.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h modules.h mod/modvals.h stat.h
 misc_file.o: misc_file.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   stat.h
 modules.o: modules.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h md5/md5.h
 net.o: net.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 rfc1459.o: rfc1459.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 tcl.o: tcl.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 tcldcc.o: tcldcc.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h modules.h mod/modvals.h
 tclhash.o: tclhash.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 tclmisc.o: tclmisc.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h md5/md5.h
 tcluser.o: tcluser.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   tandem.h modules.h mod/modvals.h
 tls.o: tls.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 userent.o: userent.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
+  compat/strcasecmp.h
 userrec.o: userrec.c main.h ../config.h ../lush.h eggdrop.h \
   flags.h proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h
 users.o: users.c main.h ../config.h ../lush.h eggdrop.h flags.h \
   proto.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
   compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
-  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
+  compat/strcasecmp.h \
   modules.h mod/modvals.h tandem.h
Index: eggdrop1.8/src/cmds.c
diff -u eggdrop1.8/src/cmds.c:1.4.2.1 eggdrop1.8/src/cmds.c:1.4.2.2
--- eggdrop1.8/src/cmds.c:1.4.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/cmds.c	Wed Jan 12 07:54:00 2011
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.4.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: cmds.c,v 1.4.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -159,7 +159,7 @@
         ok = 1;
         dprintf(idx, _("Bots connected:\n"));
       }
-      egg_strftime(s, 14, "%d %b %H:%M", localtime(&dcc[i].timeval));
+      strftime(s, 14, "%d %b %H:%M", localtime(&dcc[i].timeval));
       if (atr & USER_OWNER) {
         egg_snprintf(format, sizeof format,
                      "  [%%.2lu]  %%s%%c%%-%us (%%s) %%s\n", nicklen);
Index: eggdrop1.8/src/compat/Makefile.in
diff -u eggdrop1.8/src/compat/Makefile.in:1.3.2.1 eggdrop1.8/src/compat/Makefile.in:1.3.2.2
--- eggdrop1.8/src/compat/Makefile.in:1.3.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/compat/Makefile.in	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/compat/
-# $Id: Makefile.in,v 1.3.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile.in,v 1.3.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -19,7 +19,7 @@
 CPPFLAGS = @CPPFLAGS@
 
 OBJS = gethostbyname2.o in6.o inet_aton.o inet_ntop.o inet_pton.o snprintf.o \
-	memset.o memcpy.o strcasecmp.o strftime.o
+	strcasecmp.o
 
 doofus:
 	@echo ""
@@ -50,87 +50,53 @@
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h in6.h gethostbyname2.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h in6.h gethostbyname2.h
 in6.o: in6.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h in6.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h in6.h
 inet_aton.o: inet_aton.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h inet_aton.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h inet_aton.h
 inet_ntop.o: inet_ntop.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h in6.h inet_ntop.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h in6.h inet_ntop.h
 inet_pton.o: inet_pton.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h in6.h inet_pton.h
-memcpy.o: memcpy.c ../../src/main.h ../../config.h ../../lush.h \
-  ../../src/eggdrop.h ../../src/flags.h \
-  ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
-  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
-  ../../src/users.h ../../src/compat/compat.h \
-  ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h memcpy.h
-memset.o: memset.c ../../src/main.h ../../config.h ../../lush.h \
-  ../../src/eggdrop.h ../../src/flags.h \
-  ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
-  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
-  ../../src/users.h ../../src/compat/compat.h \
-  ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h memset.h
+  ../../src/compat/snprintf.h ../../src/compat/strcasecmp.h \
+  in6.h inet_pton.h
 snprintf.o: snprintf.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h snprintf.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h snprintf.h
 strcasecmp.o: strcasecmp.c ../../src/main.h ../../config.h ../../lush.h \
   ../../src/eggdrop.h ../../src/flags.h \
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h \
   ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h memcpy.h
-strftime.o: strftime.c ../../src/main.h ../../config.h ../../lush.h \
-  ../../src/eggdrop.h ../../src/flags.h \
-  ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
-  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
-  ../../src/users.h ../../src/compat/compat.h \
-  ../../src/compat/inet_aton.h ../../src/main.h \
-  ../../src/compat/snprintf.h ../../src/compat/memset.h \
-  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
-  ../../src/compat/strftime.h strftime.h
+  ../../src/compat/snprintf.h \
+  ../../src/compat/strcasecmp.h
Index: eggdrop1.8/src/compat/compat.h
diff -u eggdrop1.8/src/compat/compat.h:1.2 eggdrop1.8/src/compat/compat.h:1.2.2.1
--- eggdrop1.8/src/compat/compat.h:1.2	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/compat/compat.h	Wed Jan 12 07:54:00 2011
@@ -2,7 +2,7 @@
  * compat.h
  *   wrap-around header for all compability functions.
  *
- * $Id: compat.h,v 1.2 2010/08/05 18:12:05 pseudo Exp $
+ * $Id: compat.h,v 1.2.2.1 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 2000 - 2010 Eggheads Development Team
@@ -27,10 +27,7 @@
 
 #include "inet_aton.h"
 #include "snprintf.h"
-#include "memset.h"
-#include "memcpy.h"
 #include "strcasecmp.h"
-#include "strftime.h"
 #include "inet_ntop.h"
 #include "inet_pton.h"
 #include "gethostbyname2.h"
Index: eggdrop1.8/src/compat/gnu_strftime.c
diff -u eggdrop1.8/src/compat/gnu_strftime.c:1.1.1.1 eggdrop1.8/src/compat/gnu_strftime.c:removed
--- eggdrop1.8/src/compat/gnu_strftime.c:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/gnu_strftime.c	Wed Jan 12 07:54:11 2011
@@ -1,1257 +0,0 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define HAVE_LIMITS_H 1
-# define HAVE_MBLEN 1
-# define HAVE_MBRLEN 1
-# define HAVE_STRUCT_ERA_ENTRY 1
-# define HAVE_TM_GMTOFF 1
-# define HAVE_TM_ZONE 1
-# define HAVE_TZNAME 1
-# define HAVE_TZSET 1
-# define MULTIBYTE_IS_FORMAT_SAFE 1
-# define STDC_HEADERS 1
-# include "../locale/localeinfo.h"
-#endif
-
-#if defined emacs && !defined HAVE_BCOPY
-# define HAVE_MEMCPY 1
-#endif
-
-#include <ctype.h>
-#include <sys/types.h>		/* Some systems define `time_t' here.  */
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-#if HAVE_TZNAME
-extern char *tzname[];
-#endif
-
-/* Do multibyte processing if multibytes are supported, unless
-   multibyte sequences are safe in formats.  Multibyte sequences are
-   safe if they cannot contain byte sequences that look like format
-   conversion specifications.  The GNU C Library uses UTF8 multibyte
-   encoding, which is safe for formats, but strftime.c can be used
-   with other C libraries that use unsafe encodings.  */
-#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
-
-#if DO_MULTIBYTE
-# if HAVE_MBRLEN
-#  include <wchar.h>
-# else
-   /* Simulate mbrlen with mblen as best we can.  */
-#  define mbstate_t int
-#  define mbrlen(s, n, ps) mblen (s, n)
-#  define mbsinit(ps) (*(ps) == 0)
-# endif
-  static const mbstate_t mbstate_zero;
-#endif
-
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#if STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef HAVE_MEMCPY
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
-
-#ifdef _LIBC
-# define MEMPCPY(d, s, n) __mempcpy (d, s, n)
-#else
-# ifndef HAVE_MEMPCPY
-#  define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n)))
-# endif
-#endif
-
-#ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif  /* GCC.  */
-#endif  /* Not __P.  */
-
-#ifndef PTR
-# ifdef __STDC__
-#  define PTR void *
-# else
-#  define PTR char *
-# endif
-#endif
-
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
-#ifndef NULL
-# define NULL 0
-#endif
-
-#define TYPE_SIGNED(t) ((t) -1 < 0)
-
-/* Bound on length of the string representing an integer value of type t.
-   Subtract one for the sign bit if t is signed;
-   302 / 1000 is log10 (2) rounded up;
-   add one for integer division truncation;
-   add one more for a minus sign if t is signed.  */
-#define INT_STRLEN_BOUND(t) \
- ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 + 1 + TYPE_SIGNED (t))
-
-#define TM_YEAR_BASE 1900
-
-#ifndef __isleap
-/* Nonzero if YEAR is a leap year (every 4 years,
-   except every 100th isn't, and every 400th is).  */
-# define __isleap(year)	\
-  ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-#endif
-
-
-#ifdef _LIBC
-# define my_strftime_gmtime_r __gmtime_r
-# define my_strftime_localtime_r __localtime_r
-# define tzname __tzname
-# define tzset __tzset
-#else
-
-/* If we're a strftime substitute in a GNU program, then prefer gmtime
-   to gmtime_r, since many gmtime_r implementations are buggy.
-   Similarly for localtime_r.  */
-
-# if ! HAVE_TM_GMTOFF
-static struct tm *my_strftime_gmtime_r __P ((const time_t *, struct tm *));
-static struct tm *
-my_strftime_gmtime_r (t, tp)
-     const time_t *t;
-     struct tm *tp;
-{
-  struct tm *l = gmtime (t);
-  if (! l)
-    return 0;
-  *tp = *l;
-  return tp;
-}
-# endif /* ! HAVE_TM_GMTOFF */
-
-static struct tm *my_strftime_localtime_r __P ((const time_t *, struct tm *));
-static struct tm *
-my_strftime_localtime_r (t, tp)
-     const time_t *t;
-     struct tm *tp;
-{
-  struct tm *l = localtime (t);
-  if (! l)
-    return 0;
-  *tp = *l;
-  return tp;
-}
-#endif /* ! defined _LIBC */
-
-
-#if !defined memset && !defined HAVE_MEMSET && !defined _LIBC
-/* Some systems lack the `memset' function and we don't want to
-   introduce additional dependencies.  */
-/* The SGI compiler reportedly barfs on the trailing null
-   if we use a string constant as the initializer.  28 June 1997, rms.  */
-static const char spaces[16] = /* "                " */
-  { ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ' };
-static const char zeroes[16] = /* "0000000000000000" */
-  { '0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0' };
-
-# define memset_space(P, Len) \
-  do {									      \
-    int _len = (Len);							      \
-									      \
-    do									      \
-      {									      \
-	int _this = _len > 16 ? 16 : _len;				      \
-	(P) = MEMPCPY ((P), spaces, _this);				      \
-	_len -= _this;							      \
-      }									      \
-    while (_len > 0);							      \
-  } while (0)
-
-# define memset_zero(P, Len) \
-  do {									      \
-    int _len = (Len);							      \
-									      \
-    do									      \
-      {									      \
-	int _this = _len > 16 ? 16 : _len;				      \
-	(P) = MEMPCPY ((P), zeroes, _this);				      \
-	_len -= _this;							      \
-      }									      \
-    while (_len > 0);							      \
-  } while (0)
-#else
-# define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len))
-# define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len))
-#endif
-
-#define add(n, f)							      \
-  do									      \
-    {									      \
-      int _n = (n);							      \
-      int _delta = width - _n;						      \
-      int _incr = _n + (_delta > 0 ? _delta : 0);			      \
-      if (i + _incr >= maxsize)						      \
-	return 0;							      \
-      if (p)								      \
-	{								      \
-	  if (_delta > 0)						      \
-	    {								      \
-	      if (pad == '0')						      \
-		memset_zero (p, _delta);				      \
-	      else							      \
-		memset_space (p, _delta);				      \
-	    }								      \
-	  f;								      \
-	  p += _n;							      \
-	}								      \
-      i += _incr;							      \
-    } while (0)
-
-#define cpy(n, s) \
-    add ((n),								      \
-	 if (to_lowcase)						      \
-	   memcpy_lowcase (p, (s), _n);					      \
-	 else if (to_uppcase)						      \
-	   memcpy_uppcase (p, (s), _n);					      \
-	 else								      \
-	   memcpy ((PTR) p, (PTR) (s), _n))
-
-
-
-#ifdef _LIBC
-# define TOUPPER(Ch) toupper (Ch)
-# define TOLOWER(Ch) tolower (Ch)
-#else
-# define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch))
-# define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-#endif
-/* We don't use `isdigit' here since the locale dependent
-   interpretation is not what we want here.  We only need to accept
-   the arabic digits in the ASCII range.  One day there is perhaps a
-   more reliable way to accept other sets of digits.  */
-#define ISDIGIT(Ch) ((unsigned int) (Ch) - '0' <= 9)
-
-static char *memcpy_lowcase __P ((char *dest, const char *src, size_t len));
-
-static char *
-memcpy_lowcase (dest, src, len)
-     char *dest;
-     const char *src;
-     size_t len;
-{
-  while (len-- > 0)
-    dest[len] = TOLOWER ((unsigned char) src[len]);
-  return dest;
-}
-
-static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len));
-
-static char *
-memcpy_uppcase (dest, src, len)
-     char *dest;
-     const char *src;
-     size_t len;
-{
-  while (len-- > 0)
-    dest[len] = TOUPPER ((unsigned char) src[len]);
-  return dest;
-}
-
-
-#if ! HAVE_TM_GMTOFF
-/* Yield the difference between *A and *B,
-   measured in seconds, ignoring leap seconds.  */
-# define tm_diff ftime_tm_diff
-static int tm_diff __P ((const struct tm *, const struct tm *));
-static int
-tm_diff (a, b)
-     const struct tm *a;
-     const struct tm *b;
-{
-  /* Compute intervening leap days correctly even if year is negative.
-     Take care to avoid int overflow in leap day calculations,
-     but it's OK to assume that A and B are close to each other.  */
-  int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3);
-  int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3);
-  int a100 = a4 / 25 - (a4 % 25 < 0);
-  int b100 = b4 / 25 - (b4 % 25 < 0);
-  int a400 = a100 >> 2;
-  int b400 = b100 >> 2;
-  int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
-  int years = a->tm_year - b->tm_year;
-  int days = (365 * years + intervening_leap_days
-	      + (a->tm_yday - b->tm_yday));
-  return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
-		+ (a->tm_min - b->tm_min))
-	  + (a->tm_sec - b->tm_sec));
-}
-#endif /* ! HAVE_TM_GMTOFF */
-
-
-
-/* The number of days from the first day of the first ISO week of this
-   year to the year day YDAY with week day WDAY.  ISO weeks start on
-   Monday; the first ISO week has the year's first Thursday.  YDAY may
-   be as small as YDAY_MINIMUM.  */
-#define ISO_WEEK_START_WDAY 1 /* Monday */
-#define ISO_WEEK1_WDAY 4 /* Thursday */
-#define YDAY_MINIMUM (-366)
-static int iso_week_days __P ((int, int));
-#ifdef __GNUC__
-__inline__
-#endif
-static int
-iso_week_days (yday, wday)
-     int yday;
-     int wday;
-{
-  /* Add enough to the first operand of % to make it nonnegative.  */
-  int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
-  return (yday
-	  - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
-	  + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
-}
-
-
-#if !(defined _NL_CURRENT || HAVE_STRFTIME)
-static char const weekday_name[][10] =
-  {
-    "Sunday", "Monday", "Tuesday", "Wednesday",
-    "Thursday", "Friday", "Saturday"
-  };
-static char const month_name[][10] =
-  {
-    "January", "February", "March", "April", "May", "June",
-    "July", "August", "September", "October", "November", "December"
-  };
-#endif
-
-
-#ifdef emacs
-# define my_strftime emacs_strftimeu
-# define ut_argument , ut
-# define ut_argument_spec int ut;
-# define ut_argument_spec_iso , int ut
-#else
-# define my_strftime strftime
-# define ut_argument
-# define ut_argument_spec
-# define ut_argument_spec_iso
-/* We don't have this information in general.  */
-# define ut 0
-#endif
-
-#if !defined _LIBC && HAVE_TZNAME && HAVE_TZSET
-  /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
-     Work around this bug by copying *tp before it might be munged.  */
-  size_t _strftime_copytm __P ((char *, size_t, const char *,
-			        const struct tm * ut_argument_spec_iso));
-  size_t
-  my_strftime (s, maxsize, format, tp ut_argument)
-      char *s;
-      size_t maxsize;
-      const char *format;
-      const struct tm *tp;
-      ut_argument_spec
-  {
-    struct tm tmcopy;
-    tmcopy = *tp;
-    return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
-  }
-# undef my_strftime
-# define my_strftime(S, Maxsize, Format, Tp) \
-  _strftime_copytm (S, Maxsize, Format, Tp)
-#endif
-
-
-/* Write information from TP into S according to the format
-   string FORMAT, writing no more that MAXSIZE characters
-   (including the terminating '\0') and returning number of
-   characters written.  If S is NULL, nothing will be written
-   anywhere, so to determine how many characters would be
-   written, use NULL for S and (size_t) UINT_MAX for MAXSIZE.  */
-size_t
-my_strftime (s, maxsize, format, tp ut_argument)
-      char *s;
-      size_t maxsize;
-      const char *format;
-      const struct tm *tp;
-      ut_argument_spec
-{
-  int hour12 = tp->tm_hour;
-#ifdef _NL_CURRENT
-  /* We cannot make the following values variables since we must delay
-     the evaluation of these values until really needed since some
-     expressions might not be valid in every situation.  The `struct tm'
-     might be generated by a strptime() call that initialized
-     only a few elements.  Dereference the pointers only if the format
-     requires this.  Then it is ok to fail if the pointers are invalid.  */
-# define a_wkday _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday)
-# define f_wkday _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday)
-# define a_month _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon)
-# define f_month _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon)
-# define ampm _NL_CURRENT (LC_TIME, tp->tm_hour > 11 ? PM_STR : AM_STR)
-
-# define aw_len strlen (a_wkday)
-# define am_len strlen (a_month)
-# define ap_len strlen (ampm)
-#else
-# if !HAVE_STRFTIME
-# define f_wkday (weekday_name[tp->tm_wday])
-# define f_month (month_name[tp->tm_mon])
-# define a_wkday f_wkday
-# define a_month f_month
-# define ampm ("AMPM" + 2 * (tp->tm_hour > 11))
-
-  size_t aw_len = 3;
-  size_t am_len = 3;
-  size_t ap_len = 2;
-# endif
-#endif
-  const char *zone;
-  size_t i = 0;
-  char *p = s;
-  const char *f;
-
-  zone = NULL;
-#if HAVE_TM_ZONE
-  /* The POSIX test suite assumes that setting
-     the environment variable TZ to a new value before calling strftime()
-     will influence the result (the %Z format) even if the information in
-     TP is computed with a totally different time zone.
-     This is bogus: though POSIX allows bad behavior like this,
-     POSIX does not require it.  Do the right thing instead.  */
-  zone = (const char *) tp->tm_zone;
-#endif
-#if HAVE_TZNAME
-  if (ut)
-    {
-      if (! (zone && *zone))
-	zone = "GMT";
-    }
-  else
-    {
-      /* POSIX.1 8.1.1 requires that whenever strftime() is called, the
-	 time zone names contained in the external variable `tzname' shall
-	 be set as if the tzset() function had been called.  */
-# if HAVE_TZSET
-      tzset ();
-# endif
-    }
-#endif
-
-  if (hour12 > 12)
-    hour12 -= 12;
-  else
-    if (hour12 == 0)
-      hour12 = 12;
-
-  for (f = format; *f != '\0'; ++f)
-    {
-      int pad = 0;		/* Padding for number ('-', '_', or 0).  */
-      int modifier;		/* Field modifier ('E', 'O', or 0).  */
-      int digits;		/* Max digits for numeric format.  */
-      int number_value; 	/* Numeric value to be printed.  */
-      int negative_number;	/* 1 if the number is negative.  */
-      const char *subfmt;
-      char *bufp;
-      char buf[1 + (sizeof (int) < sizeof (time_t)
-		    ? INT_STRLEN_BOUND (time_t)
-		    : INT_STRLEN_BOUND (int))];
-      int width = -1;
-      int to_lowcase = 0;
-      int to_uppcase = 0;
-      int change_case = 0;
-      int format_char;
-
-#if DO_MULTIBYTE
-
-       switch (*f)
-	{
-	case '%':
-	  break;
-
-	case '\a': case '\b': case '\t': case '\n':
-	case '\v': case '\f': case '\r':
-	case ' ': case '!': case '"': case '#': case '&': case'\'':
-	case '(': case ')': case '*': case '+': case ',': case '-':
-	case '.': case '/': case '0': case '1': case '2': case '3':
-	case '4': case '5': case '6': case '7': case '8': case '9':
-	case ':': case ';': case '<': case '=': case '>': case '?':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-	case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
-	case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-	case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-	case 'Y': case 'Z': case '[': case'\\': case ']': case '^':
-	case '_': case 'a': case 'b': case 'c': case 'd': case 'e':
-	case 'f': case 'g': case 'h': case 'i': case 'j': case 'k':
-	case 'l': case 'm': case 'n': case 'o': case 'p': case 'q':
-	case 'r': case 's': case 't': case 'u': case 'v': case 'w':
-	case 'x': case 'y': case 'z': case '{': case '|': case '}':
-	case '~':
-	  /* The C Standard requires these 98 characters (plus '%') to
-	     be in the basic execution character set.  None of these
-	     characters can start a multibyte sequence, so they need
-	     not be analyzed further.  */
-	  add (1, *p = *f);
-	  continue;
-
-	default:
-	  /* Copy this multibyte sequence until we reach its end, find
-	     an error, or come back to the initial shift state.  */
-	  {
-	    mbstate_t mbstate = mbstate_zero;
-	    size_t len = 0;
-
-	    do
-	      {
-		size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate);
-
-		if (bytes == 0)
-		  break;
-
-		if (bytes == (size_t) -2)
-		  {
-		    len += strlen (f + len);
-		    break;
-		  }
-
-		if (bytes == (size_t) -1)
-		  {
-		    len++;
-		    break;
-		  }
-
-		len += bytes;
-	      }
-	    while (! mbsinit (&mbstate));
-
-	    cpy (len, f);
-	    f += len - 1;
-	    continue;
-	  }
-	}
-
-#else /* ! DO_MULTIBYTE */
-
-      /* Either multibyte encodings are not supported, or they are
-	 safe for formats, so any non-'%' byte can be copied through.  */
-      if (*f != '%')
-	{
-	  add (1, *p = *f);
-	  continue;
-	}
-
-#endif /* ! DO_MULTIBYTE */
-
-      /* Check for flags that can modify a format.  */
-      while (1)
-	{
-	  switch (*++f)
-	    {
-	      /* This influences the number formats.  */
-	    case '_':
-	    case '-':
-	    case '0':
-	      pad = *f;
-	      continue;
-
-	      /* This changes textual output.  */
-	    case '^':
-	      to_uppcase = 1;
-	      continue;
-	    case '#':
-	      change_case = 1;
-	      continue;
-
-	    default:
-	      break;
-	    }
-	  break;
-	}
-
-      /* As a GNU extension we allow to specify the field width.  */
-      if (ISDIGIT (*f))
-	{
-	  width = 0;
-	  do
-	    {
-	      width *= 10;
-	      width += *f - '0';
-	      ++f;
-	    }
-	  while (ISDIGIT (*f));
-	}
-
-      /* Check for modifiers.  */
-      switch (*f)
-	{
-	case 'E':
-	case 'O':
-	  modifier = *f++;
-	  break;
-
-	default:
-	  modifier = 0;
-	  break;
-	}
-
-      /* Now do the specified format.  */
-      format_char = *f;
-      switch (format_char)
-	{
-#define DO_NUMBER(d, v) \
-	  digits = width == -1 ? d : width;				      \
-	  number_value = v; goto do_number
-#define DO_NUMBER_SPACEPAD(d, v) \
-	  digits = width == -1 ? d : width;				      \
-	  number_value = v; goto do_number_spacepad
-
-	case '%':
-	  if (modifier != 0)
-	    goto bad_format;
-	  add (1, *p = *f);
-	  break;
-
-	case 'a':
-	  if (modifier != 0)
-	    goto bad_format;
-	  if (change_case)
-	    {
-	      to_uppcase = 1;
-	      to_lowcase = 0;
-	    }
-#if defined _NL_CURRENT || !HAVE_STRFTIME
-	  cpy (aw_len, a_wkday);
-	  break;
-#else
-	  goto underlying_strftime;
-#endif
-
-	case 'A':
-	  if (modifier != 0)
-	    goto bad_format;
-	  if (change_case)
-	    {
-	      to_uppcase = 1;
-	      to_lowcase = 0;
-	    }
-#if defined _NL_CURRENT || !HAVE_STRFTIME
-	  cpy (strlen (f_wkday), f_wkday);
-	  break;
-#else
-	  goto underlying_strftime;
-#endif
-
-	case 'b':
-	case 'h':		/* POSIX.2 extension.  */
-	  if (modifier != 0)
-	    goto bad_format;
-#if defined _NL_CURRENT || !HAVE_STRFTIME
-	  cpy (am_len, a_month);
-	  break;
-#else
-	  goto underlying_strftime;
-#endif
-
-	case 'B':
-	  if (modifier != 0)
-	    goto bad_format;
-	  if (change_case)
-	    {
-	      to_uppcase = 1;
-	      to_lowcase = 0;
-	    }
-#if defined _NL_CURRENT || !HAVE_STRFTIME
-	  cpy (strlen (f_month), f_month);
-	  break;
-#else
-	  goto underlying_strftime;
-#endif
-
-	case 'c':
-	  if (modifier == 'O')
-	    goto bad_format;
-#ifdef _NL_CURRENT
-	  if (! (modifier == 'E'
-		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0'))
-	    subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
-#else
-# if HAVE_STRFTIME
-	  goto underlying_strftime;
-# else
-	  subfmt = "%a %b %e %H:%M:%S %Y";
-# endif
-#endif
-
-	subformat:
-	  {
-	    char *old_start = p;
-	    size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp);
-	    add (len, my_strftime (p, maxsize - i, subfmt, tp));
-
-	    if (to_uppcase)
-	      while (old_start < p)
-		{
-		  *old_start = TOUPPER ((unsigned char) *old_start);
-		  ++old_start;
-		}
-	  }
-	  break;
-
-#if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY)
-	underlying_strftime:
-	  {
-	    /* The relevant information is available only via the
-	       underlying strftime implementation, so use that.  */
-	    char ufmt[4];
-	    char *u = ufmt;
-	    char ubuf[1024]; /* enough for any single format in practice */
-	    size_t len;
-	    *u++ = '%';
-	    if (modifier != 0)
-	      *u++ = modifier;
-	    *u++ = format_char;
-	    *u = '\0';
-	    len = strftime (ubuf, sizeof ubuf, ufmt, tp);
-	    if (len == 0 && ubuf[0] != '\0')
-	      return 0;
-	    cpy (len, ubuf);
-	  }
-	  break;
-#endif
-
-	case 'C':		/* POSIX.2 extension.  */
-	  if (modifier == 'O')
-	    goto bad_format;
-	  if (modifier == 'E')
-	    {
-#if HAVE_STRUCT_ERA_ENTRY
-	      struct era_entry *era = _nl_get_era_entry (tp);
-	      if (era)
-		{
-		  size_t len = strlen (era->name_fmt);
-		  cpy (len, era->name_fmt);
-		  break;
-		}
-#else
-# if HAVE_STRFTIME
-	      goto underlying_strftime;
-# endif
-#endif
-	    }
-
-	  {
-	    int year = tp->tm_year + TM_YEAR_BASE;
-	    DO_NUMBER (1, year / 100 - (year % 100 < 0));
-	  }
-
-	case 'x':
-	  if (modifier == 'O')
-	    goto bad_format;
-#ifdef _NL_CURRENT
-	  if (! (modifier == 'E'
-		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT)) != '\0'))
-	    subfmt = _NL_CURRENT (LC_TIME, D_FMT);
-	  goto subformat;
-#else
-# if HAVE_STRFTIME
-	  goto underlying_strftime;
-# else
-	  /* Fall through.  */
-# endif
-#endif
-	case 'D':		/* POSIX.2 extension.  */
-	  if (modifier != 0)
-	    goto bad_format;
-	  subfmt = "%m/%d/%y";
-	  goto subformat;
-
-	case 'd':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, tp->tm_mday);
-
-	case 'e':		/* POSIX.2 extension.  */
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER_SPACEPAD (2, tp->tm_mday);
-
-	  /* All numeric formats set DIGITS and NUMBER_VALUE and then
-	     jump to one of these two labels.  */
-
-	do_number_spacepad:
-	  /* Force `_' flag unless overwritten by `0' flag.  */
-	  if (pad != '0')
-	    pad = '_';
-
-	do_number:
-	  /* Format the number according to the MODIFIER flag.  */
-
-	  if (modifier == 'O' && 0 <= number_value)
-	    {
-#ifdef _NL_CURRENT
-	      /* Get the locale specific alternate representation of
-		 the number NUMBER_VALUE.  If none exist NULL is returned.  */
-	      const char *cp = _nl_get_alt_digit (number_value);
-
-	      if (cp != NULL)
-		{
-		  size_t digitlen = strlen (cp);
-		  if (digitlen != 0)
-		    {
-		      cpy (digitlen, cp);
-		      break;
-		    }
-		}
-#else
-# if HAVE_STRFTIME
-	      goto underlying_strftime;
-# endif
-#endif
-	    }
-	  {
-	    unsigned int u = number_value;
-
-	    bufp = buf + sizeof (buf);
-	    negative_number = number_value < 0;
-
-	    if (negative_number)
-	      u = -u;
-
-	    do
-	      *--bufp = u % 10 + '0';
-	    while ((u /= 10) != 0);
-  	  }
-
-	do_number_sign_and_padding:
-	  if (negative_number)
-	    *--bufp = '-';
-
-	  if (pad != '-')
-	    {
-	      int padding = digits - (buf + sizeof (buf) - bufp);
-
-	      if (pad == '_')
-		{
-		  while (0 < padding--)
-		    *--bufp = ' ';
-		}
-	      else
-		{
-		  bufp += negative_number;
-		  while (0 < padding--)
-		    *--bufp = '0';
-		  if (negative_number)
-		    *--bufp = '-';
-		}
-	    }
-
-	  cpy (buf + sizeof (buf) - bufp, bufp);
-	  break;
-
-	case 'F':
-	  if (modifier != 0)
-	    goto bad_format;
-	  subfmt = "%Y-%m-%d";
-	  goto subformat;
-
-	case 'H':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, tp->tm_hour);
-
-	case 'I':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, hour12);
-
-	case 'k':		/* GNU extension.  */
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER_SPACEPAD (2, tp->tm_hour);
-
-	case 'l':		/* GNU extension.  */
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER_SPACEPAD (2, hour12);
-
-	case 'j':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (3, 1 + tp->tm_yday);
-
-	case 'M':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, tp->tm_min);
-
-	case 'm':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, tp->tm_mon + 1);
-
-	case 'n':		/* POSIX.2 extension.  */
-	  add (1, *p = '\n');
-	  break;
-
-	case 'P':
-	  to_lowcase = 1;
-#if !defined _NL_CURRENT && HAVE_STRFTIME
-	  format_char = 'p';
-#endif
-	  /* FALLTHROUGH */
-
-	case 'p':
-	  if (change_case)
-	    {
-	      to_uppcase = 0;
-	      to_lowcase = 1;
-	    }
-#if defined _NL_CURRENT || !HAVE_STRFTIME
-	  cpy (ap_len, ampm);
-	  break;
-#else
-	  goto underlying_strftime;
-#endif
-
-	case 'R':		/* GNU extension.  */
-	  subfmt = "%H:%M";
-	  goto subformat;
-
-	case 'r':		/* POSIX.2 extension.  */
-#ifdef _NL_CURRENT
-	  if (*(subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM)) == '\0')
-#endif
-	    subfmt = "%I:%M:%S %p";
-	  goto subformat;
-
-	case 'S':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, tp->tm_sec);
-
-	case 's':		/* GNU extension.  */
-  	  {
-	    struct tm ltm;
-	    time_t t;
-
-	    ltm = *tp;
-	    t = mktime (&ltm);
-
-	    /* Generate string value for T using time_t arithmetic;
-	       this works even if sizeof (long) < sizeof (time_t).  */
-
-	    bufp = buf + sizeof (buf);
-	    negative_number = t < 0;
-
-	    do
-	      {
-		int d = t % 10;
-		t /= 10;
-
-		if (negative_number)
-		  {
-		    d = -d;
-
-		    /* Adjust if division truncates to minus infinity.  */
-		    if (0 < -1 % 10 && d < 0)
-		      {
-			t++;
-			d += 10;
-		      }
-		  }
-
-		*--bufp = d + '0';
-	      }
-	    while (t != 0);
-
-	    digits = 1;
-	    goto do_number_sign_and_padding;
-	  }
-
-	case 'X':
-	  if (modifier == 'O')
-	    goto bad_format;
-#ifdef _NL_CURRENT
-	  if (! (modifier == 'E'
-		 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT)) != '\0'))
-	    subfmt = _NL_CURRENT (LC_TIME, T_FMT);
-	  goto subformat;
-#else
-# if HAVE_STRFTIME
-	  goto underlying_strftime;
-# else
-	  /* Fall through.  */
-# endif
-#endif
-	case 'T':		/* POSIX.2 extension.  */
-	  subfmt = "%H:%M:%S";
-	  goto subformat;
-
-	case 't':		/* POSIX.2 extension.  */
-	  add (1, *p = '\t');
-	  break;
-
-	case 'u':		/* POSIX.2 extension.  */
-	  DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
-
-	case 'U':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
-
-	case 'V':
-	case 'g':		/* GNU extension.  */
-	case 'G':		/* GNU extension.  */
-	  if (modifier == 'E')
-	    goto bad_format;
-	  {
-	    int year = tp->tm_year + TM_YEAR_BASE;
-	    int days = iso_week_days (tp->tm_yday, tp->tm_wday);
-
-	    if (days < 0)
-	      {
-		/* This ISO week belongs to the previous year.  */
-		year--;
-		days = iso_week_days (tp->tm_yday + (365 + __isleap (year)),
-				      tp->tm_wday);
-	      }
-	    else
-	      {
-		int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
-				       tp->tm_wday);
-		if (0 <= d)
-		  {
-		    /* This ISO week belongs to the next year.  */
-		    year++;
-		    days = d;
-		  }
-	      }
-
-	    switch (*f)
-	      {
-	      case 'g':
-		DO_NUMBER (2, (year % 100 + 100) % 100);
-
-	      case 'G':
-		DO_NUMBER (1, year);
-
-	      default:
-		DO_NUMBER (2, days / 7 + 1);
-	      }
-	  }
-
-	case 'W':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
-
-	case 'w':
-	  if (modifier == 'E')
-	    goto bad_format;
-
-	  DO_NUMBER (1, tp->tm_wday);
-
-	case 'Y':
-	  if (modifier == 'E')
-	    {
-#if HAVE_STRUCT_ERA_ENTRY
-	      struct era_entry *era = _nl_get_era_entry (tp);
-	      if (era)
-		{
-		  subfmt = strchr (era->name_fmt, '\0') + 1;
-		  goto subformat;
-		}
-#else
-# if HAVE_STRFTIME
-	      goto underlying_strftime;
-# endif
-#endif
-	    }
-	  if (modifier == 'O')
-	    goto bad_format;
-	  else
-	    DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
-
-	case 'y':
-	  if (modifier == 'E')
-	    {
-#if HAVE_STRUCT_ERA_ENTRY
-	      struct era_entry *era = _nl_get_era_entry (tp);
-	      if (era)
-		{
-		  int delta = tp->tm_year - era->start_date[0];
-		  DO_NUMBER (1, (era->offset
-				 + (era->direction == '-' ? -delta : delta)));
-		}
-#else
-# if HAVE_STRFTIME
-	      goto underlying_strftime;
-# endif
-#endif
-	    }
-	  DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
-
-	case 'Z':
-	  if (change_case)
-	    {
-	      to_uppcase = 0;
-	      to_lowcase = 1;
-	    }
-
-#if HAVE_TZNAME
-	  /* The tzset() call might have changed the value.  */
-	  if (!(zone && *zone) && tp->tm_isdst >= 0)
-	    zone = tzname[tp->tm_isdst];
-#endif
-	  if (! zone)
-	    zone = "";		/* POSIX.2 requires the empty string here.  */
-
-	  cpy (strlen (zone), zone);
-	  break;
-
-	case 'z':		/* GNU extension.  */
-	  if (tp->tm_isdst < 0)
-	    break;
-
-	  {
-	    int diff;
-#if HAVE_TM_GMTOFF
-	    diff = tp->tm_gmtoff;
-#else
-	    if (ut)
-	      diff = 0;
-	    else
-	      {
-		struct tm gtm;
-		struct tm ltm;
-		time_t lt;
-
-		ltm = *tp;
-		lt = mktime (&ltm);
-
-		if (lt == (time_t) -1)
-		  {
-		    /* mktime returns -1 for errors, but -1 is also a
-		       valid time_t value.  Check whether an error really
-		       occurred.  */
-		    struct tm tm;
-
-		    if (! my_strftime_localtime_r (&lt, &tm)
-			|| ((ltm.tm_sec ^ tm.tm_sec)
-			    | (ltm.tm_min ^ tm.tm_min)
-			    | (ltm.tm_hour ^ tm.tm_hour)
-			    | (ltm.tm_mday ^ tm.tm_mday)
-			    | (ltm.tm_mon ^ tm.tm_mon)
-			    | (ltm.tm_year ^ tm.tm_year)))
-		      break;
-		  }
-
-		if (! my_strftime_gmtime_r (&lt, &gtm))
-		  break;
-
-		diff = tm_diff (&ltm, &gtm);
-	      }
-#endif
-
-	    if (diff < 0)
-	      {
-		add (1, *p = '-');
-		diff = -diff;
-	      }
-	    else
-	      add (1, *p = '+');
-
-	    diff /= 60;
-	    DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
-	  }
-
-	case '\0':		/* GNU extension: % at end of format.  */
-	    --f;
-	    /* Fall through.  */
-	default:
-	  /* Unknown format; output the format, including the '%',
-	     since this is most likely the right thing to do if a
-	     multibyte string has been misparsed.  */
-	bad_format:
-	  {
-	    int flen;
-	    for (flen = 1; f[1 - flen] != '%'; flen++)
-	      continue;
-	    cpy (flen, &f[1 - flen]);
-	  }
-	  break;
-	}
-    }
-
-  if (p && maxsize != 0)
-    *p = '\0';
-  return i;
-}
-
-
-#ifdef emacs
-/* For Emacs we have a separate interface which corresponds to the normal
-   strftime function and does not have the extra information whether the
-   TP arguments comes from a `gmtime' call or not.  */
-size_t
-emacs_strftime (s, maxsize, format, tp)
-      char *s;
-      size_t maxsize;
-      const char *format;
-      const struct tm *tp;
-{
-  return my_strftime (s, maxsize, format, tp, 0);
-}
-#endif
Index: eggdrop1.8/src/compat/memcpy.c
diff -u eggdrop1.8/src/compat/memcpy.c:1.1.1.1 eggdrop1.8/src/compat/memcpy.c:removed
--- eggdrop1.8/src/compat/memcpy.c:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/memcpy.c	Wed Jan 12 07:54:11 2011
@@ -1,35 +0,0 @@
-/*
- * memcpy.c -- provides memcpy() if necessary.
- *
- * $Id: memcpy.c,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 1999 - 2010 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include "main.h"
-#include "memcpy.h"
-
-#ifndef HAVE_MEMCPY
-void *egg_memcpy(void *dest, const void *src, size_t n)
-{
-  while (n--)
-    *((char *) dest)++ = *((char *) src)++;
-  return dest;
-}
-#endif /* !HAVE_MEMCPY */
Index: eggdrop1.8/src/compat/memcpy.h
diff -u eggdrop1.8/src/compat/memcpy.h:1.1.1.1 eggdrop1.8/src/compat/memcpy.h:removed
--- eggdrop1.8/src/compat/memcpy.h:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/memcpy.h	Wed Jan 12 07:54:11 2011
@@ -1,38 +0,0 @@
-/*
- * memcpy.h
- *   prototypes for memcpy.c
- *
- * $Id: memcpy.h,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 2000 - 2010 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _EGG_COMPAT_MEMCPY_H
-#define _EGG_COMPAT_MEMCPY_H
-
-#include "src/main.h"
-#include <string.h>
-
-#ifndef HAVE_MEMCPY
-/* Use our own implementation. */
-void *egg_memcpy(void *dest, const void *src, size_t n);
-#else
-#  define egg_memcpy memcpy
-#endif
-
-#endif /* !__EGG_COMPAT_MEMCPY_H */
Index: eggdrop1.8/src/compat/memset.c
diff -u eggdrop1.8/src/compat/memset.c:1.1.1.1 eggdrop1.8/src/compat/memset.c:removed
--- eggdrop1.8/src/compat/memset.c:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/memset.c	Wed Jan 12 07:54:11 2011
@@ -1,35 +0,0 @@
-/*
- * memset.c -- provides memset() if necessary.
- *
- * $Id: memset.c,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 2000 - 2010 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include "main.h"
-#include "memset.h"
-
-#ifndef HAVE_MEMSET
-void *egg_memset(void *dest, int c, size_t n)
-{
-  while (n--)
-    *((u_8bit_t *) dest)++ = c;
-  return dest;
-}
-#endif /* !HAVE_MEMSET */
Index: eggdrop1.8/src/compat/memset.h
diff -u eggdrop1.8/src/compat/memset.h:1.1.1.1 eggdrop1.8/src/compat/memset.h:removed
--- eggdrop1.8/src/compat/memset.h:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/memset.h	Wed Jan 12 07:54:11 2011
@@ -1,42 +0,0 @@
-/*
- * memset.h
- *   prototypes for memset.c
- *
- * $Id: memset.h,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 2000 - 2010 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _EGG_COMPAT_MEMSET_H
-#define _EGG_COMPAT_MEMSET_H
-
-#include "src/main.h"
-#include <string.h>
-
-#ifndef HAVE_MEMSET
-/* Use our own implementation. */
-void *egg_memset(void *dest, int c, size_t n);
-#else
-#  define egg_memset memset
-#endif
-
-/* Use memset instead of bzero.
- */
-#define egg_bzero(dest, n) egg_memset(dest, 0, n)
-
-#endif /* !__EGG_COMPAT_MEMSET_H */
Index: eggdrop1.8/src/compat/strcasecmp.c
diff -u eggdrop1.8/src/compat/strcasecmp.c:1.1.1.1 eggdrop1.8/src/compat/strcasecmp.c:1.1.1.1.2.1
--- eggdrop1.8/src/compat/strcasecmp.c:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/strcasecmp.c	Wed Jan 12 07:54:00 2011
@@ -1,7 +1,7 @@
 /*
  * strcasecmp.c -- provides strcasecmp() and strncasecmp if necessary.
  *
- * $Id: strcasecmp.c,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
+ * $Id: strcasecmp.c,v 1.1.1.1.2.1 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -23,7 +23,6 @@
  */
 
 #include "main.h"
-#include "memcpy.h"
 
 #ifndef HAVE_STRCASECMP
 int egg_strcasecmp(const char *s1, const char *s2)
Index: eggdrop1.8/src/compat/strftime.c
diff -u eggdrop1.8/src/compat/strftime.c:1.1.1.1 eggdrop1.8/src/compat/strftime.c:removed
--- eggdrop1.8/src/compat/strftime.c:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/strftime.c	Wed Jan 12 07:54:11 2011
@@ -1,35 +0,0 @@
-/*
- * strftime.c
- *   Portable strftime implementation. Uses GNU's strftime().
- *
- * $Id: strftime.c,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 2000 - 2010 Eggheads Development Team
- * Written by Fabian Knittel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include "src/main.h"
-#include "strftime.h"
-
-#ifndef HAVE_STRFTIME
-#  undef emacs
-#  undef _LIBC
-#  define strftime egg_strftime
-
-#  include "gnu_strftime.c"
-#endif /* !HAVE_STRFTIME */
Index: eggdrop1.8/src/compat/strftime.h
diff -u eggdrop1.8/src/compat/strftime.h:1.1.1.1 eggdrop1.8/src/compat/strftime.h:removed
--- eggdrop1.8/src/compat/strftime.h:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/compat/strftime.h	Wed Jan 12 07:54:11 2011
@@ -1,42 +0,0 @@
-/*
- * strftime.h
- *   header file for strftime.c
- *
- * $Id: strftime.h,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
- */
-/*
- * Copyright (C) 2000 - 2010 Eggheads Development Team
- * Written by Fabian Knittel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _EGG_COMPAT_STRFTIME_H_
-#define _EGG_COMPAT_STRFTIME_H_
-
-#include "src/main.h"
-#include <time.h>
-
-/* Use the system libraries version of strftime() if available. Otherwise
- * use our own.
- */
-#ifndef HAVE_STRFTIME
-size_t egg_strftime(char *s, size_t maxsize, const char *format,
-                    const struct tm *tp);
-#else
-#  define egg_strftime strftime
-#endif
-
-#endif /* !_EGG_COMPAT_STRFTIME_H_ */
Index: eggdrop1.8/src/dcc.c
diff -u eggdrop1.8/src/dcc.c:1.6.2.1 eggdrop1.8/src/dcc.c:1.6.2.2
--- eggdrop1.8/src/dcc.c:1.6.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/dcc.c	Wed Jan 12 07:54:00 2011
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.6.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: dcc.c,v 1.6.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1250,7 +1250,7 @@
     putlog(LOG_MISC, "*", _("Ident failed for %s: %s"), dcc[i].host,
            strerror(errno));
   else {
-    egg_memcpy(&dcc[j].sockname, &dcc[i].sockname, sizeof(sockname_t));
+    memcpy(&dcc[j].sockname, &dcc[i].sockname, sizeof(sockname_t));
     dcc[j].sock = getsock(dcc[j].sockname.family, 0);
     if (dcc[j].sock >= 0) {
       sockname_t name;
Index: eggdrop1.8/src/dccutil.c
diff -u eggdrop1.8/src/dccutil.c:1.3.2.1 eggdrop1.8/src/dccutil.c:1.3.2.2
--- eggdrop1.8/src/dccutil.c:1.3.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/dccutil.c	Wed Jan 12 07:54:00 2011
@@ -6,7 +6,7 @@
  *   memory management for dcc structures
  *   timeout checking for dcc connections
  *
- * $Id: dccutil.c,v 1.3.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: dccutil.c,v 1.3.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -361,7 +361,7 @@
     nfree(dcc[n].u.other);
   dcc_total--;
   if (n < dcc_total)
-    egg_memcpy(&dcc[n], &dcc[dcc_total], sizeof(struct dcc_t));
+    memcpy(&dcc[n], &dcc[dcc_total], sizeof(struct dcc_t));
   else
     egg_bzero(&dcc[n], sizeof(struct dcc_t));   /* drummer */
 }
Index: eggdrop1.8/src/dns.c
diff -u eggdrop1.8/src/dns.c:1.2.2.1 eggdrop1.8/src/dns.c:1.2.2.2
--- eggdrop1.8/src/dns.c:1.2.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/dns.c	Wed Jan 12 07:54:00 2011
@@ -4,7 +4,7 @@
  *   provides the code used by the bot if the DNS module is not loaded
  *   DNS Tcl commands
  *
- * $Id: dns.c,v 1.2.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: dns.c,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Written by Fabian Knittel <fknittel at gmx.de>
@@ -155,9 +155,9 @@
         !egg_strcasecmp(dcc[idx].u.dns->host, hostn)) {
       if (ok) {
         if (dcc[idx].u.dns->ip)
-          egg_memcpy(dcc[idx].u.dns->ip, ip, sizeof(sockname_t));
+          memcpy(dcc[idx].u.dns->ip, ip, sizeof(sockname_t));
         else
-          egg_memcpy(&dcc[idx].sockname, ip, sizeof(sockname_t));
+          memcpy(&dcc[idx].sockname, ip, sizeof(sockname_t));
         dcc[idx].u.dns->dns_success(idx);
       } else
         dcc[idx].u.dns->dns_failure(idx);
Index: eggdrop1.8/src/main.c
diff -u eggdrop1.8/src/main.c:1.6.2.2 eggdrop1.8/src/main.c:1.6.2.3
--- eggdrop1.8/src/main.c:1.6.2.2	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/main.c	Wed Jan 12 07:54:00 2011
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.6.2.2 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: main.c,v 1.6.2.3 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -574,7 +574,7 @@
       tell_mem_status_dcc(DP_STDOUT);
     }
   }
-  egg_memcpy(&nowtm, localtime(&now), sizeof(struct tm));
+  memcpy(&nowtm, localtime(&now), sizeof(struct tm));
   if (nowtm.tm_min != lastmin) {
     int i = 0;
 
@@ -1050,7 +1050,7 @@
   /* Initialize variables and stuff */
   now = time(NULL);
   chanset = NULL;
-  egg_memcpy(&nowtm, localtime(&now), sizeof(struct tm));
+  memcpy(&nowtm, localtime(&now), sizeof(struct tm));
   lastmin = nowtm.tm_min;
   srandom((unsigned int) (now % (getpid() + getppid())));
   init_mem();
Index: eggdrop1.8/src/main.h
diff -u eggdrop1.8/src/main.h:1.3.2.3 eggdrop1.8/src/main.h:1.3.2.4
--- eggdrop1.8/src/main.h:1.3.2.3	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/main.h	Wed Jan 12 07:54:00 2011
@@ -2,7 +2,7 @@
  * main.h
  *   include file to include most other include files
  *
- * $Id: main.h,v 1.3.2.3 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: main.h,v 1.3.2.4 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -143,6 +143,8 @@
 
 #define iptolong(a) (0xffffffff & (long) (htonl((unsigned long) a)))
 
+#define egg_bzero(dest, n) memset(dest, 0, n)
+
 #ifdef IPV6
 # define setsnport(s, p) do {                                           \
   if ((s).family == AF_INET6)                                           \
Index: eggdrop1.8/src/md5/Makefile.in
diff -u eggdrop1.8/src/md5/Makefile.in:1.2.2.1 eggdrop1.8/src/md5/Makefile.in:1.2.2.2
--- eggdrop1.8/src/md5/Makefile.in:1.2.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/md5/Makefile.in	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/md5/
-# $Id: Makefile.in,v 1.2.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile.in,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -47,5 +47,4 @@
   ../../src/proto.h ../../src/misc_file.h ../../src/cmdt.h \
   ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
   ../../src/users.h ../../src/compat/compat.h ../../src/compat/snprintf.h \
-  ../../src/compat/memset.h ../../src/compat/memcpy.h \
-  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h
+  ../../src/compat/strcasecmp.h
Index: eggdrop1.8/src/md5/md5c.c
diff -u eggdrop1.8/src/md5/md5c.c:1.2 eggdrop1.8/src/md5/md5c.c:1.2.2.1
--- eggdrop1.8/src/md5/md5c.c:1.2	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/md5/md5c.c	Wed Jan 12 07:54:00 2011
@@ -202,11 +202,11 @@
 		free = 64 - used;
 
 		if (size < free) {
-			egg_memcpy(&ctx->buffer[used], data, size);
+			memcpy(&ctx->buffer[used], data, size);
 			return;
 		}
 
-		egg_memcpy(&ctx->buffer[used], data, free);
+		memcpy(&ctx->buffer[used], data, free);
 		data = ((unsigned char *)data) + free;
 		size -= free;
 		body(ctx, ctx->buffer, 64);
@@ -217,7 +217,7 @@
 		size &= 0x3f;
 	}
 
-	egg_memcpy(ctx->buffer, data, size);
+	memcpy(ctx->buffer, data, size);
 }
 
 void MD5_Final(unsigned char *result, MD5_CTX *ctx)
@@ -231,13 +231,13 @@
 	free = 64 - used;
 
 	if (free < 8) {
-		egg_memset(&ctx->buffer[used], 0, free);
+		memset(&ctx->buffer[used], 0, free);
 		body(ctx, ctx->buffer, 64);
 		used = 0;
 		free = 64;
 	}
 
-	egg_memset(&ctx->buffer[used], 0, free - 8);
+	memset(&ctx->buffer[used], 0, free - 8);
 
 	ctx->lo <<= 3;
 	ctx->buffer[56] = ctx->lo;
@@ -268,6 +268,6 @@
 	result[14] = ctx->d >> 16;
 	result[15] = ctx->d >> 24;
 
-	egg_memset(ctx, 0, sizeof(ctx));
+	memset(ctx, 0, sizeof(ctx));
 }
 #endif /* HAVE_OPENSSL_MD5 */
Index: eggdrop1.8/src/misc.c
diff -u eggdrop1.8/src/misc.c:1.2.2.1 eggdrop1.8/src/misc.c:1.2.2.2
--- eggdrop1.8/src/misc.c:1.2.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/misc.c	Wed Jan 12 07:54:00 2011
@@ -7,7 +7,7 @@
  *   help system
  *   motd display and %var substitution
  *
- * $Id: misc.c,v 1.2.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: misc.c,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -468,7 +468,7 @@
     sprintf(out, P_("a day ago", "%d days ago", days), days);
     return;
   }
-  egg_strftime(out, 6, "%H:%M", localtime(&then));
+  strftime(out, 6, "%H:%M", localtime(&then));
 }
 
 /* Convert an interval (in seconds) to one of:
@@ -482,7 +482,7 @@
     sprintf(out, P_("in a day", "in %d days", days), days);
     return;
   }
-  egg_strftime(out, 20, _("at %H:%M"), localtime(&now));
+  strftime(out, 20, _("at %H:%M"), localtime(&now));
 }
 
 /* Convert an interval (in seconds) to one of:
@@ -528,7 +528,7 @@
   /* Create the timestamp */
   t = localtime(&now2);
   if (shtime) {
-    egg_strftime(stamp, sizeof(stamp) - 2, log_ts, t);
+    strftime(stamp, sizeof(stamp) - 2, log_ts, t);
     strcat(stamp, " ");
     tsl = strlen(stamp);
   }
@@ -544,9 +544,9 @@
   out[LOGLINEMAX - tsl] = 0;
   if (keep_all_logs) {
     if (!logfile_suffix[0])
-      egg_strftime(ct, 12, ".%d%b%Y", t);
+      strftime(ct, 12, ".%d%b%Y", t);
     else {
-      egg_strftime(ct, 80, logfile_suffix, t);
+      strftime(ct, 80, logfile_suffix, t);
       ct[80] = 0;
       s2 = ct;
       /* replace spaces by underscores */
@@ -713,7 +713,7 @@
          */
         char stamp[33];
 
-        egg_strftime(stamp, sizeof(stamp) - 1, log_ts, localtime(&now));
+        strftime(stamp, sizeof(stamp) - 1, log_ts, localtime(&now));
         fprintf(logs[i].f, "%s ", stamp);
         fprintf(logs[i].f, _("Last message repeated %d time(s).\n"),
                 logs[i].repeats);
@@ -926,7 +926,7 @@
       towrite = network;
       break;
     case 'T':
-      egg_strftime(sub, 6, "%H:%M", localtime(&now));
+      strftime(sub, 6, "%H:%M", localtime(&now));
       towrite = sub;
       break;
     case 'N':
Index: eggdrop1.8/src/mod/assoc.mod/Makefile
diff -u eggdrop1.8/src/mod/assoc.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/assoc.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/assoc.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/assoc.mod/Makefile	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/assoc.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 srcdir = .
 
@@ -38,7 +38,6 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/tandem.h .././assoc.mod/assoc.h
Index: eggdrop1.8/src/mod/blowfish.mod/Makefile
diff -u eggdrop1.8/src/mod/blowfish.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/blowfish.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/blowfish.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/blowfish.mod/Makefile	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/blowfish.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 srcdir = .
 
@@ -38,8 +38,8 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././blowfish.mod/blowfish.h \
   .././blowfish.mod/bf_tab.h
Index: eggdrop1.8/src/mod/channels.mod/Makefile
diff -u eggdrop1.8/src/mod/channels.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/channels.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/channels.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/channels.mod/Makefile	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/channels.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././channels.mod/channels.h \
   .././channels.mod/cmdschan.c .././channels.mod/tclchan.c \
   .././channels.mod/userchan.c .././channels.mod/udefchan.c
Index: eggdrop1.8/src/mod/compress.mod/Makefile.in
diff -u eggdrop1.8/src/mod/compress.mod/Makefile.in:1.1.1.1.2.1 eggdrop1.8/src/mod/compress.mod/Makefile.in:1.1.1.1.2.2
--- eggdrop1.8/src/mod/compress.mod/Makefile.in:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/compress.mod/Makefile.in	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile.in for src/mod/compress.mod/
-# $Id: Makefile.in,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile.in,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 ZLIB = @ZLIB@
 srcdir = .
@@ -41,8 +41,8 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/mod/share.mod/share.h \
   .././compress.mod/compress.h .././compress.mod/tclcompress.c
Index: eggdrop1.8/src/mod/compress.mod/compress.c
diff -u eggdrop1.8/src/mod/compress.mod/compress.c:1.2.2.1 eggdrop1.8/src/mod/compress.mod/compress.c:1.2.2.2
--- eggdrop1.8/src/mod/compress.mod/compress.c:1.2.2.1	Wed Nov 10 15:16:56 2010
+++ eggdrop1.8/src/mod/compress.mod/compress.c	Wed Jan 12 07:54:00 2011
@@ -6,7 +6,7 @@
  * Written by Fabian Knittel <fknittel at gmx.de>. Based on zlib examples
  * by Jean-loup Gailly and Miguel Albrecht.
  *
- * $Id: compress.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
+ * $Id: compress.c,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 2000 - 2010 Eggheads Development Team
@@ -75,8 +75,8 @@
   FILE *fin;
   register int len1, len2, i;
 
-  egg_memset(buf1, 0, 50);
-  egg_memset(buf2, 0, 50);
+  memset(buf1, 0, 50);
+  memset(buf2, 0, 50);
   if (!is_file(filename))
     return COMPF_FAILED;
 
Index: eggdrop1.8/src/mod/console.mod/Makefile
diff -u eggdrop1.8/src/mod/console.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/console.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/console.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/console.mod/Makefile	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/console.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 srcdir = .
 
@@ -38,7 +38,7 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././console.mod/console.h
Index: eggdrop1.8/src/mod/ctcp.mod/Makefile
diff -u eggdrop1.8/src/mod/ctcp.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/ctcp.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/ctcp.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/ctcp.mod/Makefile	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/ctcp.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 srcdir = .
 
@@ -39,7 +39,6 @@
   ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
   ../../../src/compat/compat.h ../../../src/compat/inet_aton.h \
   ../../../src/main.h ../../../src/compat/snprintf.h \
-  ../../../src/compat/memset.h ../../../src/compat/memcpy.h \
-  ../../../src/compat/strcasecmp.h ../../../src/compat/strftime.h \
+  ../../../src/compat/strcasecmp.h \
   ../../../src/mod/modvals.h ../../../src/tandem.h \
   ../../../src/mod/server.mod/server.h
Index: eggdrop1.8/src/mod/dns.mod/Makefile.in
diff -u eggdrop1.8/src/mod/dns.mod/Makefile.in:1.1.1.1.2.1 eggdrop1.8/src/mod/dns.mod/Makefile.in:1.1.1.1.2.2
--- eggdrop1.8/src/mod/dns.mod/Makefile.in:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/dns.mod/Makefile.in	Wed Jan 12 07:54:00 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/dns.mod/
-# $Id: Makefile.in,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile.in,v 1.1.1.1.2.2 2011/01/12 13:54:00 pseudo Exp $
 
 RESLIB = @RESLIB@
 RESINCLUDE = @RESINCLUDE@
@@ -42,7 +42,7 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././dns.mod/dns.h .././dns.mod/coredns.c
Index: eggdrop1.8/src/mod/dns.mod/coredns.c
diff -u eggdrop1.8/src/mod/dns.mod/coredns.c:1.4.2.1 eggdrop1.8/src/mod/dns.mod/coredns.c:1.4.2.2
--- eggdrop1.8/src/mod/dns.mod/coredns.c:1.4.2.1	Wed Nov 10 15:16:56 2010
+++ eggdrop1.8/src/mod/dns.mod/coredns.c	Wed Jan 12 07:54:00 2011
@@ -6,7 +6,7 @@
  * Modified/written by Fabian Knittel <fknittel at gmx.de>
  * IPv6 support added by pseudo <pseudo at egg6.net>
  *
- * $Id: coredns.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
+ * $Id: coredns.c,v 1.4.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Portions Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -275,7 +275,7 @@
 #ifdef IPV6
 static unsigned long getip6bash(struct in6_addr *ip6) {
   u_32bit_t x;
-  egg_memcpy(&x, &ip6->s6_addr, sizeof x);
+  memcpy(&x, &ip6->s6_addr, sizeof x);
   x ^= *(u_32bit_t *)&ip6->s6_addr[12];
   return (unsigned long) BASH_MODULO(x);
 }
@@ -998,7 +998,7 @@
         rp->ttl = rr->ttl;
         rp->sockname.addrlen = sizeof(struct sockaddr_in);
         rp->sockname.addr.sa.sa_family = AF_INET;
-        egg_memcpy(&rp->sockname.addr.s4.sin_addr, rr->data, 4);
+        memcpy(&rp->sockname.addr.s4.sin_addr, rr->data, 4);
 #ifndef IPV6
         passrp(rp, rr->ttl, T_A);
         return;
@@ -1017,7 +1017,7 @@
         rp->ttl = rr->ttl;
         rp->sockname.addrlen = sizeof(struct sockaddr_in6);
         rp->sockname.addr.sa.sa_family = AF_INET6;
-        egg_memcpy(&rp->sockname.addr.s6.sin6_addr, rr->data, 16);
+        memcpy(&rp->sockname.addr.s6.sin6_addr, rr->data, 16);
         if (ready || pref_af) {
           passrp(rp, rr->ttl, T_A); 
           return;
@@ -1184,7 +1184,7 @@
   rp->state = STATE_PTRREQ;
   rp->sends = 1;
   rp->type = T_PTR;
-  egg_memcpy(&rp->sockname, addr, sizeof(sockname_t));
+  memcpy(&rp->sockname, addr, sizeof(sockname_t));
   if (addr->family == AF_INET) {
     rp->ip = addr->addr.s4.sin_addr.s_addr;
     linkresolveip(rp);
Index: eggdrop1.8/src/mod/dns.mod/dns.c
diff -u eggdrop1.8/src/mod/dns.mod/dns.c:1.4.2.1 eggdrop1.8/src/mod/dns.mod/dns.c:1.4.2.2
--- eggdrop1.8/src/mod/dns.mod/dns.c:1.4.2.1	Wed Nov 10 15:16:56 2010
+++ eggdrop1.8/src/mod/dns.mod/dns.c	Wed Jan 12 07:54:00 2011
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: dns.c,v 1.4.2.1 2010/11/10 21:16:56 pseudo Exp $
+ * $Id: dns.c,v 1.4.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -295,7 +295,7 @@
   dcc[idx].sock = resfd;
   dcc[idx].timeval = now;
   strcpy(dcc[idx].nick, "(dns)");
-  egg_memcpy(&dcc[idx].sockname.addr.sa, &_res.nsaddr_list[0],
+  memcpy(&dcc[idx].sockname.addr.sa, &_res.nsaddr_list[0],
              sizeof(_res.nsaddr_list[0]));
   dcc[idx].sockname.addrlen = sizeof(_res.nsaddr_list[0]);
 
Index: eggdrop1.8/src/mod/filesys.mod/Makefile
diff -u eggdrop1.8/src/mod/filesys.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/filesys.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/filesys.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/filesys.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/filesys.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:37 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././filesys.mod/filedb3.h \
   .././filesys.mod/filesys.h .././filesys.mod/dbcompat.h \
   ../../../src/mod/transfer.mod/transfer.h ../../../src/tandem.h \
Index: eggdrop1.8/src/mod/filesys.mod/filedb3.c
diff -u eggdrop1.8/src/mod/filesys.mod/filedb3.c:1.3.2.2 eggdrop1.8/src/mod/filesys.mod/filedb3.c:1.3.2.3
--- eggdrop1.8/src/mod/filesys.mod/filedb3.c:1.3.2.2	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/filesys.mod/filedb3.c	Wed Jan 12 07:54:01 2011
@@ -4,7 +4,7 @@
  *
  * Rewritten by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: filedb3.c,v 1.3.2.2 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: filedb3.c,v 1.3.2.3 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -949,7 +949,7 @@
           if (fdbe->stat & FILE_HIDDEN)
             strcat(s2, " (hid)");
         }
-        egg_strftime(t, 10, "%d%b%Y", localtime(&fdbe->uploaded));
+        strftime(t, 10, "%d%b%Y", localtime(&fdbe->uploaded));
         if (fdbe->size < 1024)
           sprintf(s1, "%5d", fdbe->size);
         else
Index: eggdrop1.8/src/mod/irc.mod/Makefile
diff -u eggdrop1.8/src/mod/irc.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/irc.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/irc.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/irc.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/irc.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././irc.mod/irc.h \
   ../../../src/mod/server.mod/server.h \
   ../../../src/mod/channels.mod/channels.h .././irc.mod/chan.c \
Index: eggdrop1.8/src/mod/irc.mod/cmdsirc.c
diff -u eggdrop1.8/src/mod/irc.mod/cmdsirc.c:1.1.1.1.2.1 eggdrop1.8/src/mod/irc.mod/cmdsirc.c:1.1.1.1.2.2
--- eggdrop1.8/src/mod/irc.mod/cmdsirc.c:1.1.1.1.2.1	Tue Nov 16 08:16:57 2010
+++ eggdrop1.8/src/mod/irc.mod/cmdsirc.c	Wed Jan 12 07:54:01 2011
@@ -2,7 +2,7 @@
  * chancmds.c -- part of irc.mod
  *   handles commands directly relating to channel interaction
  *
- * $Id: cmdsirc.c,v 1.1.1.1.2.1 2010/11/16 14:16:57 pseudo Exp $
+ * $Id: cmdsirc.c,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -768,9 +768,9 @@
     for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
       if (m->joined > 0) {
         if ((now - (m->joined)) > 86400)
-          egg_strftime(s, 6, "%d%b", localtime(&(m->joined)));
+          strftime(s, 6, "%d%b", localtime(&(m->joined)));
         else
-          egg_strftime(s, 6, "%H:%M", localtime(&(m->joined)));
+          strftime(s, 6, "%H:%M", localtime(&(m->joined)));
       } else
         strncpyz(s, " --- ", sizeof s);
       if (m->user == NULL) {
Index: eggdrop1.8/src/mod/irc.mod/irc.c
diff -u eggdrop1.8/src/mod/irc.mod/irc.c:1.3.2.1 eggdrop1.8/src/mod/irc.mod/irc.c:1.3.2.2
--- eggdrop1.8/src/mod/irc.mod/irc.c:1.3.2.1	Tue Nov 16 08:16:57 2010
+++ eggdrop1.8/src/mod/irc.mod/irc.c	Wed Jan 12 07:54:01 2011
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.3.2.1 2010/11/16 14:16:57 pseudo Exp $
+ * $Id: irc.c,v 1.3.2.2 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -125,7 +125,7 @@
   get_user_flagrec(u, &fr, chan->dname);
 
   /* Get current time into a string */
-  egg_strftime(ct, 7, "%d %b", localtime(&now));
+  strftime(ct, 7, "%d %b", localtime(&now));
 
   /* Put together log and kick messages */
   reason[0] = 0;
Index: eggdrop1.8/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.3.2.2 eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.3.2.3
--- eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.3.2.2	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/irc.mod/msgcmds.c	Wed Jan 12 07:54:01 2011
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.3.2.2 2010/11/17 13:58:38 pseudo Exp $
+ * $Id: msgcmds.c,v 1.3.2.3 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -535,7 +535,7 @@
           hand_on_chan(chan, u) || (glob_op(fr) && !chan_deop(fr)) ||
           glob_friend(fr) || chan_op(fr) || chan_friend(fr))) {
         tt = cr->laston;
-        egg_strftime(s, 14, "%b %d %H:%M", localtime(&tt));
+        strftime(s, 14, "%b %d %H:%M", localtime(&tt));
         ok = 1;
         egg_snprintf(s1, sizeof s1, "NOTICE %s :[%s] %s %s on %s", nick,
                      u2->handle, _("Last seen at"), s, chan->dname);
Index: eggdrop1.8/src/mod/module.h
diff -u eggdrop1.8/src/mod/module.h:1.5.2.1 eggdrop1.8/src/mod/module.h:1.5.2.2
--- eggdrop1.8/src/mod/module.h:1.5.2.1	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/mod/module.h	Wed Jan 12 07:54:00 2011
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.5.2.1 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: module.h,v 1.5.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -70,9 +70,6 @@
 #ifdef egg_snprintf
 #  undef egg_snprintf
 #endif
-#ifdef egg_memset
-#  undef egg_memset
-#endif
 #ifdef egg_strcasecmp
 #  undef egg_strcasecmp
 #endif
@@ -436,7 +433,7 @@
 /* 252 - 255 */
 #define egg_snprintf (global[252])
 #define egg_vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[253])
-#define egg_memset ((void *(*)(void *, int, size_t))global[254])
+/* 254: egg_memset() -- UNUSED (pseudo) */
 #define egg_strcasecmp ((int (*)(const char *, const char *))global[255])
 /* 256 - 259 */
 #define egg_strncasecmp ((int (*)(const char *, const char *, size_t))global[256])
Index: eggdrop1.8/src/mod/notes.mod/Makefile
diff -u eggdrop1.8/src/mod/notes.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/notes.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/notes.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/notes.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/notes.mod
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,8 +38,8 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/tandem.h .././notes.mod/notes.h \
   .././notes.mod/cmdsnote.c
Index: eggdrop1.8/src/mod/notes.mod/notes.c
diff -u eggdrop1.8/src/mod/notes.mod/notes.c:1.2.2.2 eggdrop1.8/src/mod/notes.mod/notes.c:1.2.2.3
--- eggdrop1.8/src/mod/notes.mod/notes.c:1.2.2.2	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/notes.mod/notes.c	Wed Jan 12 07:54:01 2011
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.2.2.2 2010/11/17 13:58:38 pseudo Exp $
+ * $Id: notes.c,v 1.2.2.3 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -507,7 +507,7 @@
           from = newsplit(&s1);
           dt = newsplit(&s1);
           tt = atoi(dt);
-          egg_strftime(wt, 14, "%b %d %H:%M", localtime(&tt));
+          strftime(wt, 14, "%b %d %H:%M", localtime(&tt));
           dt = wt;
           lapse = (int) ((now - tt) / 86400);
           if (lapse > note_life - 7) {
Index: eggdrop1.8/src/mod/seen.mod/Makefile
diff -u eggdrop1.8/src/mod/seen.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/seen.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/seen.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/seen.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/seen.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,8 +38,8 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/users.h ../../../src/chan.h \
   ../../../src/mod/channels.mod/channels.h
Index: eggdrop1.8/src/mod/server.mod/Makefile
diff -u eggdrop1.8/src/mod/server.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/server.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/server.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/server.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/server.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h .././server.mod/server.h \
   .././server.mod/servmsg.c .././server.mod/cmdsserv.c \
   .././server.mod/tclserv.c
Index: eggdrop1.8/src/mod/server.mod/server.c
diff -u eggdrop1.8/src/mod/server.mod/server.c:1.6.2.1 eggdrop1.8/src/mod/server.mod/server.c:1.6.2.2
--- eggdrop1.8/src/mod/server.mod/server.c:1.6.2.1	Tue Nov 16 08:16:57 2010
+++ eggdrop1.8/src/mod/server.mod/server.c	Wed Jan 12 07:54:01 2011
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.6.2.1 2010/11/16 14:16:57 pseudo Exp $
+ * $Id: server.c,v 1.6.2.2 2011/01/12 13:54:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -895,7 +895,7 @@
 
     q->len = len;
     q->msg = nmalloc(len + 1);
-    egg_memcpy(q->msg, buf, len);
+    memcpy(q->msg, buf, len);
     q->msg[len] = 0;
     h->tot++;
     h->warned = 0;
Index: eggdrop1.8/src/mod/share.mod/Makefile
diff -u eggdrop1.8/src/mod/share.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/share.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/share.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/share.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/share.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/chan.h ../../../src/users.h \
   ../../../src/mod/transfer.mod/transfer.h \
   ../../../src/mod/channels.mod/channels.h .././share.mod/share.h \
Index: eggdrop1.8/src/mod/transfer.mod/Makefile
diff -u eggdrop1.8/src/mod/transfer.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/transfer.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/transfer.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/transfer.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/transfer.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,9 +38,9 @@
   ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
   ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h ../../../src/tandem.h ../../../src/users.h \
   .././transfer.mod/transfer.h .././transfer.mod/transferfstat.c \
   .././transfer.mod/transferqueue.c .././transfer.mod/tcltransfer.c
Index: eggdrop1.8/src/mod/uptime.mod/Makefile
diff -u eggdrop1.8/src/mod/uptime.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/uptime.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/uptime.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/uptime.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/uptime.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 srcdir = .
 
 
@@ -38,7 +38,6 @@
   ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
   ../../../src/compat/compat.h ../../../src/compat/inet_aton.h \
   ../../../src/main.h ../../../src/compat/snprintf.h \
-  ../../../src/compat/memset.h ../../../src/compat/memcpy.h \
-  ../../../src/compat/strcasecmp.h ../../../src/compat/strftime.h \
+  ../../../src/compat/strcasecmp.h \
   .././uptime.mod/../modvals.h ../../../src/tandem.h \
   .././uptime.mod/../server.mod/server.h
Index: eggdrop1.8/src/mod/uptime.mod/uptime.c
diff -u eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2.2.1 eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2.2.2
--- eggdrop1.8/src/mod/uptime.mod/uptime.c:1.2.2.1	Wed Nov 10 15:16:56 2010
+++ eggdrop1.8/src/mod/uptime.mod/uptime.c	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 /*
- * $Id: uptime.c,v 1.2.2.1 2010/11/10 21:16:56 pseudo Exp $
+ * $Id: uptime.c,v 1.2.2.2 2011/01/12 13:54:01 pseudo Exp $
  *
  * This module reports uptime information about your bot to http://uptime.eggheads.org. The
  * purpose for this is to see how your bot rates against many others (including EnergyMechs
@@ -154,7 +154,7 @@
     putlog(LOG_DEBUG, "*", _("init_uptime socket returned < 0 %d"), uptimesock);
     return ((uptimesock = -1));
   }
-  egg_memset(&sai, 0, sizeof(sai));
+  memset(&sai, 0, sizeof(sai));
   sai.sin_addr.s_addr = INADDR_ANY;
   sai.sin_family = AF_INET;
   if (bind(uptimesock, (struct sockaddr *) &sai, sizeof(sai)) < 0) {
Index: eggdrop1.8/src/mod/woobie.mod/Makefile
diff -u eggdrop1.8/src/mod/woobie.mod/Makefile:1.1.1.1.2.1 eggdrop1.8/src/mod/woobie.mod/Makefile:1.1.1.1.2.2
--- eggdrop1.8/src/mod/woobie.mod/Makefile:1.1.1.1.2.1	Wed Nov 17 07:58:38 2010
+++ eggdrop1.8/src/mod/woobie.mod/Makefile	Wed Jan 12 07:54:01 2011
@@ -1,5 +1,5 @@
 # Makefile for src/mod/woobie.mod/
-# $Id: Makefile,v 1.1.1.1.2.1 2010/11/17 13:58:38 pseudo Exp $
+# $Id: Makefile,v 1.1.1.1.2.2 2011/01/12 13:54:01 pseudo Exp $
 
 srcdir = .
 
@@ -38,7 +38,7 @@
   ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
   ../../../src/users.h ../../../src/compat/compat.h \
   ../../../src/compat/inet_aton.h ../../../src/main.h \
-  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
-  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
-  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
+  ../../../src/compat/snprintf.h \
+  ../../../src/compat/strcasecmp.h \
+  ../../../src/mod/modvals.h \
   ../../../src/tandem.h
Index: eggdrop1.8/src/modules.c
diff -u eggdrop1.8/src/modules.c:1.3.2.2 eggdrop1.8/src/modules.c:1.3.2.3
--- eggdrop1.8/src/modules.c:1.3.2.2	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/modules.c	Wed Jan 12 07:54:00 2011
@@ -4,7 +4,7 @@
  *
  * by Darrin Smith (beldin at light.iinet.net.au)
  *
- * $Id: modules.c,v 1.3.2.2 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: modules.c,v 1.3.2.3 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -319,7 +319,7 @@
   (Function) open_telnet,
   /* 88 - 91 */
   (Function) check_tcl_event,
-  (Function) egg_memcpy,
+  (Function) 0,                   /* egg_memcpy -- UNUSED! (pseudo)      */
   (Function) my_atoul,
   (Function) my_strcpy,
   /* 92 - 95 */
@@ -546,7 +546,7 @@
   /* 252 - 255 */
   (Function) egg_snprintf,
   (Function) egg_vsnprintf,
-  (Function) egg_memset,
+  (Function) 0,
   (Function) egg_strcasecmp,
   /* 256 - 259 */
   (Function) egg_strncasecmp,
Index: eggdrop1.8/src/net.c
diff -u eggdrop1.8/src/net.c:1.6.2.1 eggdrop1.8/src/net.c:1.6.2.2
--- eggdrop1.8/src/net.c:1.6.2.1	Mon Nov  8 04:02:30 2010
+++ eggdrop1.8/src/net.c	Wed Jan 12 07:54:00 2011
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  *
- * $Id: net.c,v 1.6.2.1 2010/11/08 10:02:30 pseudo Exp $
+ * $Id: net.c,v 1.6.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * This is hereby released into the public domain.
@@ -173,9 +173,9 @@
       hp = NULL;
     if (hp) {
       if (hp->h_addrtype == AF_INET)
-        egg_memcpy(&addr->addr.s4.sin_addr, hp->h_addr, hp->h_length);
+        memcpy(&addr->addr.s4.sin_addr, hp->h_addr, hp->h_length);
       else
-        egg_memcpy(&addr->addr.s6.sin6_addr, hp->h_addr, hp->h_length);
+        memcpy(&addr->addr.s6.sin6_addr, hp->h_addr, hp->h_length);
       af = hp->h_addrtype;
     }
   }
@@ -202,7 +202,7 @@
     } else
       hp = NULL;
     if (hp) {
-      egg_memcpy(&addr->addr.s4.sin_addr, hp->h_addr, hp->h_length);
+      memcpy(&addr->addr.s4.sin_addr, hp->h_addr, hp->h_length);
       af = hp->h_addrtype;
     }
   } else
@@ -455,7 +455,7 @@
     for (i = 0; i < threaddata()->MAXSOCKS; i++) 
       if (!(socklist[i].flags & SOCK_UNUSED) && socklist[i].sock == sock)
         socklist[i].flags |= SOCK_PROXYWAIT;    /* drummer */
-    egg_memcpy(host, &addr->addr.s4.sin_addr.s_addr, 4);
+    memcpy(host, &addr->addr.s4.sin_addr.s_addr, 4);
     egg_snprintf(s, sizeof s, "\004\001%c%c%c%c%c%c%s", port % 256,
                  (port >> 8) % 256, host[0], host[1], host[2], host[3], botuser);
     tputs(sock, s, strlen(botuser) + 9);        /* drummer */
@@ -907,15 +907,15 @@
         /* Handling buffered binary data (must have been SOCK_BUFFER before). */
         if (socklist[i].handler.sock.inbuflen <= 510) {
           *len = socklist[i].handler.sock.inbuflen;
-          egg_memcpy(s, socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuflen);
+          memcpy(s, socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuflen);
           nfree(socklist[i].handler.sock.inbuf);
           socklist[i].handler.sock.inbuf = NULL;
           socklist[i].handler.sock.inbuflen = 0;
         } else {
           /* Split up into chunks of 510 bytes. */
           *len = 510;
-          egg_memcpy(s, socklist[i].handler.sock.inbuf, *len);
-          egg_memcpy(socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuf + *len, *len);
+          memcpy(s, socklist[i].handler.sock.inbuf, *len);
+          memcpy(socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuf + *len, *len);
           socklist[i].handler.sock.inbuflen -= *len;
           socklist[i].handler.sock.inbuf = nrealloc(socklist[i].handler.sock.inbuf, socklist[i].handler.sock.inbuflen);
         }
@@ -944,7 +944,7 @@
       socklist[ret].handler.sock.inbuflen = *len;
       socklist[ret].handler.sock.inbuf = nmalloc(*len + 1);
       /* It might be binary data. You never know. */
-      egg_memcpy(socklist[ret].handler.sock.inbuf, xx, *len);
+      memcpy(socklist[ret].handler.sock.inbuf, xx, *len);
       socklist[ret].handler.sock.inbuf[*len] = 0;
     }
     socklist[ret].flags &= ~SOCK_CONNECT;
@@ -952,7 +952,7 @@
     return socklist[ret].sock;
   }
   if (socklist[ret].flags & SOCK_BINARY) {
-    egg_memcpy(s, xx, *len);
+    memcpy(s, xx, *len);
     return socklist[ret].sock;
   }
   if (socklist[ret].flags & (SOCK_LISTEN | SOCK_PASS | SOCK_TCL)) {
@@ -962,7 +962,7 @@
   if (socklist[ret].flags & SOCK_BUFFER) {
     socklist[ret].handler.sock.inbuf = (char *) nrealloc(socklist[ret].handler.sock.inbuf,
                                             socklist[ret].handler.sock.inbuflen + *len + 1);
-    egg_memcpy(socklist[ret].handler.sock.inbuf + socklist[ret].handler.sock.inbuflen, xx, *len);
+    memcpy(socklist[ret].handler.sock.inbuf + socklist[ret].handler.sock.inbuflen, xx, *len);
     socklist[ret].handler.sock.inbuflen += *len;
     /* We don't know whether it's binary data. Make sure normal strings
      * will be handled properly later on too. */
@@ -1084,7 +1084,7 @@
       if (socklist[i].handler.sock.outbuf != NULL) {
         /* Already queueing: just add it */
         p = (char *) nrealloc(socklist[i].handler.sock.outbuf, socklist[i].handler.sock.outbuflen + len);
-        egg_memcpy(p + socklist[i].handler.sock.outbuflen, s, len);
+        memcpy(p + socklist[i].handler.sock.outbuflen, s, len);
         socklist[i].handler.sock.outbuf = p;
         socklist[i].handler.sock.outbuflen += len;
         return;
@@ -1112,7 +1112,7 @@
       if (x < len) {
         /* Socket is full, queue it */
         socklist[i].handler.sock.outbuf = nmalloc(len - x);
-        egg_memcpy(socklist[i].handler.sock.outbuf, &s[x], len - x);
+        memcpy(socklist[i].handler.sock.outbuf, &s[x], len - x);
         socklist[i].handler.sock.outbuflen = len - x;
       }
       return;
@@ -1209,7 +1209,7 @@
 
         /* This removes any sent bytes from the beginning of the buffer */
         socklist[i].handler.sock.outbuf = nmalloc(socklist[i].handler.sock.outbuflen - x);
-        egg_memcpy(socklist[i].handler.sock.outbuf, p + x, socklist[i].handler.sock.outbuflen - x);
+        memcpy(socklist[i].handler.sock.outbuf, p + x, socklist[i].handler.sock.outbuflen - x);
         socklist[i].handler.sock.outbuflen -= x;
         nfree(p);
       } else {
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.25.2.7 eggdrop1.8/src/patch.h:1.25.2.8
--- eggdrop1.8/src/patch.h:1.25.2.7	Wed Nov 17 07:58:37 2010
+++ eggdrop1.8/src/patch.h	Wed Jan 12 07:54:00 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.25.2.7 2010/11/17 13:58:37 pseudo Exp $
+ * $Id: patch.h,v 1.25.2.8 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1289991988");            /* current unixtime */
+patch("1294840247");            /* current unixtime */
 /*
  *
  *
  */
-patch("unlang");
+patch("c89");
 /*
  *
  *
Index: eggdrop1.8/src/tcl.c
diff -u eggdrop1.8/src/tcl.c:1.9.2.1 eggdrop1.8/src/tcl.c:1.9.2.2
--- eggdrop1.8/src/tcl.c:1.9.2.1	Mon Nov  8 04:02:31 2010
+++ eggdrop1.8/src/tcl.c	Wed Jan 12 07:54:00 2011
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.9.2.1 2010/11/08 10:02:31 pseudo Exp $
+ * $Id: tcl.c,v 1.9.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -292,7 +292,7 @@
       if (!bytes)
         return NULL;
       s = malloc(len + 1);
-      egg_memcpy(s, bytes, len);
+      memcpy(s, bytes, len);
       s[len] = 0;
     }
 #else
@@ -340,7 +340,7 @@
 
   objc += 5;
   strings = (char **) nmalloc(sizeof(char *) * objc);
-  egg_memset(strings, 0, sizeof(char *) * objc);
+  memset(strings, 0, sizeof(char *) * objc);
   diff = utftot;
   utftot += sizeof(char *) * objc;
   objc -= 5;
Index: eggdrop1.8/src/tclhash.c
diff -u eggdrop1.8/src/tclhash.c:1.3.2.1 eggdrop1.8/src/tclhash.c:1.3.2.2
--- eggdrop1.8/src/tclhash.c:1.3.2.1	Mon Nov  8 04:02:31 2010
+++ eggdrop1.8/src/tclhash.c	Wed Jan 12 07:54:00 2011
@@ -7,7 +7,7 @@
  *   (non-Tcl) procedure lookups for msg/dcc/file commands
  *   (Tcl) binding internal procedures to msg/dcc/file commands
  *
- * $Id: tclhash.c,v 1.3.2.1 2010/11/08 10:02:31 pseudo Exp $
+ * $Id: tclhash.c,v 1.3.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -73,7 +73,7 @@
   void *ptr = nmalloc(size);
 #endif
 
-  egg_memset(ptr, 0, size);
+  memset(ptr, 0, size);
   return ptr;
 }
 
Index: eggdrop1.8/src/tclmisc.c
diff -u eggdrop1.8/src/tclmisc.c:1.5.2.1 eggdrop1.8/src/tclmisc.c:1.5.2.2
--- eggdrop1.8/src/tclmisc.c:1.5.2.1	Wed Nov 10 07:39:19 2010
+++ eggdrop1.8/src/tclmisc.c	Wed Jan 12 07:54:00 2011
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.5.2.1 2010/11/10 13:39:19 pseudo Exp $
+ * $Id: tclmisc.c,v 1.5.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -430,7 +430,7 @@
   else
     t = now;
   tm1 = localtime(&t);
-  if (egg_strftime(buf, sizeof(buf) - 1, argv[1], tm1)) {
+  if (strftime(buf, sizeof(buf) - 1, argv[1], tm1)) {
     Tcl_AppendResult(irp, buf, NULL);
     return TCL_OK;
   }
Index: eggdrop1.8/src/users.c
diff -u eggdrop1.8/src/users.c:1.2.2.1 eggdrop1.8/src/users.c:1.2.2.2
--- eggdrop1.8/src/users.c:1.2.2.1	Mon Nov  8 04:02:33 2010
+++ eggdrop1.8/src/users.c	Wed Jan 12 07:54:00 2011
@@ -10,7 +10,7 @@
  *
  * dprintf'ized, 9nov1995
  *
- * $Id: users.c,v 1.2.2.1 2010/11/08 10:02:33 pseudo Exp $
+ * $Id: users.c,v 1.2.2.2 2011/01/12 13:54:00 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -499,9 +499,9 @@
   else {
     now2 = now - li->laston;
     if (now2 >= 86400)
-      egg_strftime(s1, 11, "%Y-%m-%d", localtime(&li->laston));
+      strftime(s1, 11, "%Y-%m-%d", localtime(&li->laston));
     else
-      egg_strftime(s1, 6, "%H:%M", localtime(&li->laston));
+      strftime(s1, 6, "%H:%M", localtime(&li->laston));
   }
   egg_snprintf(format, sizeof format, "%%-%us %%-5s%%5d %%-15s %%s (%%s)\n",
                HANDLEN);
@@ -518,9 +518,9 @@
       else {
         now2 = now - (ch->laston);
         if (now2 >= 86400)
-          egg_strftime(s1, 11, "%Y-%m-%d", localtime(&ch->laston));
+          strftime(s1, 11, "%Y-%m-%d", localtime(&ch->laston));
         else
-          egg_strftime(s1, 6, "%H:%M", localtime(&ch->laston));
+          strftime(s1, 6, "%H:%M", localtime(&ch->laston));
       }
       fr.match = FR_CHAN;
       fr.chan = ch->flags;
----------------------- End of diff -----------------------


More information about the Changes mailing list