[cvslog] (2004-09-02 22:49:36 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Thu Sep 2 16:49:36 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2004-09-02 22:49:35 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     eggdrop.conf doc/html/mod-server.html doc/settings/mod.server
     misc/newversion src/patch.h src/proto.h
     src/mod/server.mod/server.c

Log message:

I keep noticing little bugs while working on 1.7, hehe.

* Fixed a portability bug in server.c. memcpy() was being used directly instead of via the compat function egg_memcpy().
* Removed unused prototype for nonexistant function 'stristr()'.
* Doc updates related to strict-host. Should be easier for users to understand it's purpose now.
* Couple updates to misc/newversion (sync 1.7).

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/html/mod-server.html
diff -u eggdrop1.6/doc/html/mod-server.html:1.31 eggdrop1.6/doc/html/mod-server.html:1.32
--- eggdrop1.6/doc/html/mod-server.html:1.31	Thu Jan  8 23:56:36 2004
+++ eggdrop1.6/doc/html/mod-server.html	Thu Sep  2 17:49:25 2004
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.31 2004/01/09 05:56:36 wcc Exp $ -->
+<!-- $Id: mod-server.html,v 1.32 2004/09/02 22:49:25 wcc Exp $ -->
 
 <html>
   <head>
@@ -230,8 +230,8 @@
         <dt><strong>set strict-host 0</strong></dt>
 
         <dd>
-          <p>Set this to 1 if you don&#39;t want your the bot to strip a
-          leading &#39;~&#39;on user at hosts.</p>
+          <p>Set this to 0 if you want the bot to strip &#39;~&#39; characters
+          from user at hosts before matching them.</p>
         </dd>
 
         <dt><strong>set quiet-reject 1</strong></dt>
Index: eggdrop1.6/doc/settings/mod.server
diff -u eggdrop1.6/doc/settings/mod.server:1.32 eggdrop1.6/doc/settings/mod.server:1.33
--- eggdrop1.6/doc/settings/mod.server:1.32	Sat Jul 24 22:56:59 2004
+++ eggdrop1.6/doc/settings/mod.server	Thu Sep  2 17:49:25 2004
@@ -1,4 +1,4 @@
-$Id: mod.server,v 1.32 2004/07/25 03:56:59 wcc Exp $
+$Id: mod.server,v 1.33 2004/09/02 22:49:25 wcc Exp $
 
 Server Module
 Last revised: February 12, 2003
@@ -136,8 +136,8 @@
 
 
     set strict-host 0
-      Set this to 1 if you don't want your the bot to strip a leading '~'
-      on user at hosts.
+      Set this to 0 if you want the bot to strip '~' characters from user at hosts
+      before matching them.
 
 
     set quiet-reject 1
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.40 eggdrop1.6/eggdrop.conf:1.41
--- eggdrop1.6/eggdrop.conf:1.40	Sat Aug 21 17:43:27 2004
+++ eggdrop1.6/eggdrop.conf	Thu Sep  2 17:49:25 2004
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.40 2004/08/21 22:43:27 wcc Exp $
+# $Id: eggdrop.conf,v 1.41 2004/09/02 22:49:25 wcc Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -817,8 +817,8 @@
 # primary nickname is already in use.
 set keep-nick 1
 
-# Set this to 1 if you don't want your the bot to strip a leading '~' on
-# user at hosts.
+# Set this to 0 if you want the bot to strip '~' characters from user at hosts
+# before matching them.
 set strict-host 0
 
 # This setting makes the bot squelch the error message when rejecting a DCC
Index: eggdrop1.6/misc/newversion
diff -u eggdrop1.6/misc/newversion:1.2 eggdrop1.6/misc/newversion:1.3
--- eggdrop1.6/misc/newversion:1.2	Mon Aug 23 22:41:04 2004
+++ eggdrop1.6/misc/newversion	Thu Sep  2 17:49:25 2004
@@ -23,11 +23,12 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 #
-# $Id: newversion,v 1.2 2004/08/24 03:41:04 wcc Exp $
+# $Id: newversion,v 1.3 2004/09/02 22:49:25 wcc Exp $
 
 MOD_CONFIGURE_ACS="src/mod/compress.mod/configure.ac src/mod/dns.mod/configure.ac"
-MISC_DOCS="doc/COMPILE-GUIDE doc/PATCH-HOWTO doc/TEXT-SUBSTITUTIONS \
-	doc/html/app-textsub.html doc/html/compiling.html doc/html/patch-howto.html"
+DOCS="doc/COMPILE-GUIDE doc/PATCH-HOWTO doc/tcl-commands.doc doc/TEXT-SUBSTITUTIONS \
+	doc/html/app-textsub.html doc/html/compiling.html doc/tcl-commands.html \
+	doc/html/patch-howto.html"
 
 fix_main_c() {
 	sed -e 's:egg_numver = .*$:egg_numver = '${NEW_NUMVERSION}';:' \
@@ -35,15 +36,6 @@
 	mv src/main.c_ src/main.c
 }
 
-fix_tcl_docs() {
-	sed -e 's:^|: :g' \
-	    -e 's:'${OLD_EGGVERSION}':'${NEW_EGGVERSION}':g' doc/tcl-commands.doc > doc/tcl-commands.doc_
-	sed -e 's:<strong>\* :<strong>:g' \
-	    -e 's:'${OLD_EGGVERSION}':'${NEW_EGGVERSION}':g' doc/html/tcl-commands.html > doc/html/tcl-commands.html_
-	mv doc/tcl-commands.doc_ doc/tcl-commands.doc
-	mv doc/html/tcl-commands.html_ doc/html/tcl-commands.html
-}
-
 if test ! -f src/main.c; then
 	echo "You are not in the Eggdrop root directory."
 	exit 1
@@ -52,7 +44,7 @@
 umask 022
 
 OLD_EGGVERSION=$(grep AC_INIT configure.ac | sed -e 's/AC_INIT(\[Eggdrop\],\[//g' -e 's/\],\[bugs at eggheads.org\])//g')
-NEW_EGGVERSION=1.6.$(($(echo $OLD_EGGVERSION | cut -d. -f3) + 1))
+NEW_EGGVERSION=$(echo $OLD_EGGVERSION | cut -d. -f1-2).$(($(echo $OLD_EGGVERSION | cut -d. -f3) + 1))
 NEW_NUMVERSION=$(($(grep 'egg_numver =' src/main.c | sed -e 's/.*= //' -e 's/;$//') + 100))
 
 # Change the patch to 'none'.
@@ -65,11 +57,6 @@
 fix_main_c
 echo " done."
 
-# Update tcl-commands docs.
-echo -n "Updating doc/tcl-commands.doc and doc/html/tcl-commands.html..."
-fix_tcl_docs
-echo " done."
-
 # Fix configure.ac's.
 echo -n "Fixing configure.ac files..."
 for i in $MOD_CONFIGURE_ACS configure.ac; do
@@ -78,8 +65,8 @@
 done
 echo " done."
 
-echo -n "Fixing misc docs..."
-for i in $MISC_DOCS; do
+echo -n "Fixing docs..."
+for i in $DOCS; do
 	sed 's:'${OLD_EGGVERSION}':'${NEW_EGGVERSION}':g' $i > ${i}_
 	mv ${i}_ $i
 done
@@ -97,5 +84,5 @@
 done
 echo "  cd $PWD"
 echo ""
-echo "Don't forget to add $NEW_EGGVERSION to doc/UPDATES1.6."
+echo "Don't forget to add $NEW_EGGVERSION to UPDATES."
 echo ""
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.118 eggdrop1.6/src/mod/server.mod/server.c:1.119
--- eggdrop1.6/src/mod/server.mod/server.c:1.118	Fri Jul  2 16:02:02 2004
+++ eggdrop1.6/src/mod/server.mod/server.c	Thu Sep  2 17:49:25 2004
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.118 2004/07/02 21:02:02 wcc Exp $
+ * $Id: server.c,v 1.119 2004/09/02 22:49:25 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -882,7 +882,7 @@
 
     q->len = len;
     q->msg = nmalloc(len + 1);
-    memcpy(q->msg, buf, len);
+    egg_memcpy(q->msg, buf, len);
     q->msg[len] = 0;
     h->tot++;
     h->warned = 0;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1135 eggdrop1.6/src/patch.h:1.1136
--- eggdrop1.6/src/patch.h:1.1135	Sat Aug 28 01:50:35 2004
+++ eggdrop1.6/src/patch.h	Thu Sep  2 17:49:25 2004
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1135 2004/08/28 06:50:35 wcc Exp $
+ * $Id: patch.h,v 1.1136 2004/09/02 22:49:25 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1093675847");            /* current unixtime */
+patch("1094165344");            /* current unixtime */
 /*
  *
  *
  */
-patch("cleanup");
+patch("smallfixes");
 /*
  *
  *
Index: eggdrop1.6/src/proto.h
diff -u eggdrop1.6/src/proto.h:1.65 eggdrop1.6/src/proto.h:1.66
--- eggdrop1.6/src/proto.h:1.65	Sat Aug 28 01:50:35 2004
+++ eggdrop1.6/src/proto.h	Thu Sep  2 17:49:25 2004
@@ -7,7 +7,7 @@
  * because they use structures in those
  * (saves including those .h files EVERY time) - Beldin
  *
- * $Id: proto.h,v 1.65 2004/08/28 06:50:35 wcc Exp $
+ * $Id: proto.h,v 1.66 2004/09/02 22:49:25 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -203,7 +203,6 @@
 void putlog EGG_VARARGS(int, arg1);
 void flushlogs();
 void check_logsize();
-char *stristr(char *, char *);
 void splitc(char *, char *, char);
 void splitcn(char *, char *, char, size_t);
 void remove_crlf(char **);
----------------------- End of diff -----------------------



More information about the Changes mailing list