[cvslog] (2004-04-05 23:35:30 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Apr 5 17:35:30 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2004-04-05 23:35:30 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     eggdrop.conf doc/BUG-REPORT doc/COMPILING-FAQ doc/UPDATES1.6
     doc/html/compiling.html src/patch.h src/tclhash.c
     src/mod/irc.mod/chan.c src/mod/irc.mod/irc.c

Log message:

* Better support for non-standard "op" prefixes (UnrealIRCD, etc.). 
  Patch by Sven.
* More doc updates/etc.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/BUG-REPORT
diff -u eggdrop1.6/doc/BUG-REPORT:1.18 eggdrop1.6/doc/BUG-REPORT:1.19
--- eggdrop1.6/doc/BUG-REPORT:1.18	Mon Dec  8 18:27:13 2003
+++ eggdrop1.6/doc/BUG-REPORT	Mon Apr  5 18:35:19 2004
@@ -17,6 +17,8 @@
 [1]  Please complete as many fields as possible.
 [2]  Email the completed report to: bugs at eggheads.org
 
+DO NOT SEND HTML E-MAIL TO THE LISTS.
+
 =====================================================================
 1) INFORMATION ABOUT YOUR EGGDROP
 
Index: eggdrop1.6/doc/COMPILING-FAQ
diff -u eggdrop1.6/doc/COMPILING-FAQ:1.4 eggdrop1.6/doc/COMPILING-FAQ:1.5
--- eggdrop1.6/doc/COMPILING-FAQ:1.4	Sat Jan 17 20:11:39 2004
+++ eggdrop1.6/doc/COMPILING-FAQ	Mon Apr  5 18:35:19 2004
@@ -1,4 +1,4 @@
-$Id: COMPILING-FAQ,v 1.4 2004/01/18 02:11:39 wcc Exp $
+$Id: COMPILING-FAQ,v 1.5 2004/04/05 23:35:19 wcc Exp $
 
 Compiling FAQ
 Last revised: January 15, 2004
@@ -63,7 +63,7 @@
            --enable-strip
              If you want to create a smaller binary, you can use this option.
              HOWEVER, this will remove debugging symbols and make bug reports
-             almost completely useless, and is not recomended. If disk space
+             almost completely useless, and is not recommended. If disk space
              is very limited, however, it might help to enable this.
 
            --disable-tcl-threads
@@ -105,7 +105,7 @@
     B.HP-UX B.11.*
 
       Dynamic module support is not currently working properly with HP-UX 11.*.
-      During a linking in a dynamic build, you may experiance an error such as:
+      During a linking in a dynamic build, you may experience an error such as:
 
         gcc -pipe -fPIC -shared -o ../eggdrop bg.o botcmd.o botmsg.o botnet.o
 	chanprog.o cmds.o dcc.o dccutil.o dns.o flags.o language.o match.o
@@ -231,7 +231,7 @@
 
     E. Tcl Detection and Installation
         If ./configure does not correctly detect the location of your Tcl
-        library and header file, or if you experiance errors related to Tcl
+        library and header file, or if you experience errors related to Tcl
         during linking, preform these steps:
 
           1. Depending on what shell your using:
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.543 eggdrop1.6/doc/UPDATES1.6:1.544
--- eggdrop1.6/doc/UPDATES1.6:1.543	Sun Mar 14 07:52:29 2004
+++ eggdrop1.6/doc/UPDATES1.6	Mon Apr  5 18:35:19 2004
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.543 2004/03/14 13:52:29 wcc Exp $
+$Id: UPDATES1.6,v 1.544 2004/04/05 23:35:19 wcc Exp $
 
 Eggdrop Changes (since v1.6.0)
      _________________________________________________________________
@@ -11,6 +11,9 @@
     ftp://ftp.eggheads.org/pub/eggdrop/UPDATES/
 
   1.6.16:
+    - Better support for non-standard "op" prefixes (UnrealIRCD, etc.).
+    * Patch by: Sven
+
     - Terminate wire_bot[] in wire.mod, fixing a crash.
     * Patch by: Bryan Dolan
 
@@ -77,94 +80,94 @@
     - Cosmetic updates to the build process.
     * Patch by: Wcc
 
-    - new UPDATES1.6 format to allow for longer found by/patched by feilds and
-      less wrapping of description
-    * Patch by: Wcc
-
-    - exported oatoi() to modules since someone somewhere might find it useful
+    - Exported oatoi() to modules since someone somewhere might find it useful.
     * Patch by: Wcc
 
-    - fixed a bug preventing masks starting with numbers from being
-      removed/stuck/unstuck
+    - Fixed a bug preventing masks starting with numbers from being
+      removed/stuck/unstuck.
     * Found by: BarkerJr - Patch by: Wcc
 
-    - fixed the very very horrible handling of arguments by tcl_dnslookup()
+    - Fixed the very very horrible handling of arguments by tcl_dnslookup().
     * Found by: wanderer - Patch by: KuNgFo0/Wcc
 
-    - don't rejoin +inactive channels when kicked from them. This can be caused
+    - Don't rejoin +inactive channels when kicked from them. This can be caused
       by bot-server connection lag or full queues.
     * Patch by: BarkerJr/Eule
 
-    - uname fix in msg_status; os should display on freebsd now
+    - uname fix in msg_status; OS should display on freebsd now.
     * Patch by: Wcc
 
-    - fixed a buffer overrun in msg_status()
+    - Fixed a buffer overrun in msg_status().
     * Patch by: Wcc
 
-    - fixed a getdesc segfault when a file has no desc
+    - Fixed a getdesc segfault when a file has no desc.
     * Found by: R. Ramos - Patch by: dw
 
-    - removed IPv6 for now, will be implemented in a more proper way in an
-      upcoming release
+    - Removed IPv6 for now, will be implemented in a more proper way in an
+      upcoming release.
     * Found by: Various - Patch by: Wcc
 
-    - cleaned up "illegal channel option" Tcl errors
+    - Cleaned up "illegal channel option" Tcl errors.
     * Patch by: BarkerJr
 
-    - .chanset accepts '*'; reflect in the docs
+    - .chanset accepts '*'; reflect in the docs.
     * Found by: Darki - Patch by: Wiktor
 
-    - fixed bug 365 (missing call to check_this_user in tcl_setuser)
+    - Fixed bug 365 (missing call to check_this_user in tcl_setuser).
     * Found by: T. Salomäki - Patch by: Eule
 
-    - Description: .-ban number #channel now works correctly
+    - Description: .-ban number #channel now works correctly.
     * Found by: R. Brooklyn - Patch by: Sven
 
-    - a few minor fixes to fakemode kicks
+    - A few minor fixes to fakemode kicks.
     * Patch by: Sven
 
-    - made appropriate changes to accommodate for EFnet's implementation of
-      exempts and invites
+    - Made appropriate changes to accommodate for EFnet's implementation of
+      exempts and invites.
     * Patch by: Wcc
 
-    - bind documentation updates
+    - bind documentation updates.
     * Found by: |SmAsH| - Patch by: Wcc
 
-    - exported strip_mirc_codes() and check_ansi() from dcc.c to modules
+    - Exported strip_mirc_codes() and check_ansi() from dcc.c to modules.
     * Found by: BarkerJr - Patch by: Wcc
 
     - H_notc used wrong handler
     * Patch by: Paul E./stdarg
 
-    - check to make sure file we want to send exists when resuming a transfer
+    - Check to make sure file we want to send exists when resuming a transfer.
     * Found by: fbs - Patch by: stdarg
 
     - Removed unnecessary quiet_reject checks in msg_ident() that have been
       present since 1.3.0+bel17.
     * Patch by: Tothwolf
 
-    - fixed exporting of MD5 functions to modules
+    - Fixed exporting of MD5 functions to modules.
     * Patch by: Paladin
 
-    - the binary is no longer stripped unless ./configure --enable-strip
-      is used
+    - The binary is no longer stripped unless ./configure --enable-strip
+      is used.
     * Found by: Various - Patch by: stdarg
 
-    - small fix to n_realloc()
+    - Small fix to n_realloc().
     * Patch by: tchaika
 
-    - fixed output of tcl_duration to not return extra spaces
+    - Fixed output of tcl_duration to not return extra spaces.
     * Found by: wanderer - Patch by: Wcc
 
-    - cmd_topic works for halfops now
+    - cmd_topic works for halfops now.
     * Patch by: stdarg
 
-    - fixed cmd_(de)voice logic
+    - Fixed cmd_(de)voice logic.
     * Found by: Various - Patch by: stdarg
 
-    - fixed an uninitialized variable in putlog()
+    - Fixed an uninitialized variable in putlog().
     * Found by: Various - Patch by: TaKeDa
 
+    - New UPDATES1.6 format to allow for longer found by/patched by feilds and
+      less wrapping of description.
+    * Patch by: Wcc
+
 1.6.15 (04 May 2003)
 Found by  Fixed by  What...
 MORA      Wcc       fixed a patch.h compile error
Index: eggdrop1.6/doc/html/compiling.html
diff -u eggdrop1.6/doc/html/compiling.html:1.23 eggdrop1.6/doc/html/compiling.html:1.24
--- eggdrop1.6/doc/html/compiling.html:1.23	Tue Jan 13 04:21:00 2004
+++ eggdrop1.6/doc/html/compiling.html	Mon Apr  5 18:35:20 2004
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: compiling.html,v 1.23 2004/01/13 10:21:00 wcc Exp $ -->
+<!-- $Id: compiling.html,v 1.24 2004/04/05 23:35:20 wcc Exp $ -->
 
 <html>
   <head>
@@ -14,10 +14,15 @@
 
     <p>This FAQ may help you successfully compile Eggdrop. Suggestions are by
     various contributors. If you think something should be added, please send
-    an e-mail to <a href="mailto:eggdev at eggheads.org">eggdev at eggheads.org</a>.
-    Note that in this document, text between a &#39;&lt;&#39; and a
-    &#39;&gt;&#39; should be replaced (without the &#39;&lt;&#39; and
-    &#39;&gt;&#39;).</p>
+    an e-mail to
+    <a href="mailto:docteam at eggheads.org">docteam at eggheads.org</a>. Note that
+    in this document, text between a &#39;&lt;&#39; and a &#39;&gt;&#39; should
+    be replaced (without the &#39;&lt;&#39; and &#39;&gt;&#39;).</p>
+
+    <p>NOTE: This is not a &#39;quick install&#39; guide. See the INSTALL file
+    for basic setup information. This is intended to help you compile the bot
+    on uncommon operating systems, or work past problems encountered during
+    compile.</p>
 
     <p><strong>Contents</strong></p>
 
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.33 eggdrop1.6/eggdrop.conf:1.34
--- eggdrop1.6/eggdrop.conf:1.33	Mon Jan 12 19:30:25 2004
+++ eggdrop1.6/eggdrop.conf	Mon Apr  5 18:35:19 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.33 2004/01/13 01:30:25 wcc Exp $
+# $Id: eggdrop.conf,v 1.34 2004/04/05 23:35:19 wcc Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -1029,6 +1029,13 @@
 unbind msg - ident *msg:ident
 unbind msg - addhost *msg:addhost
 
+# Some IRC servers are using some non-standard op-like channel prefixes/modes.
+# Define them here so the bot can recognize them. Just "@" should be fine for
+# most networks. Un-comment the second line for some UnrealIRCds.
+
+set opchars "@"
+#set opchars "@&~"
+
 # If you are so lame you want the bot to display peoples info lines, even
 # when you are too lazy to add their chanrecs to a channel, set this to 1.
 # *NOTE* This means *every* user with an info line will have their info
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.114 eggdrop1.6/src/mod/irc.mod/chan.c:1.115
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.114	Sat Jan 10 02:41:38 2004
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Mon Apr  5 18:35:20 2004
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.114 2004/01/10 08:41:38 wcc Exp $
+ * $Id: chan.c,v 1.115 2004/04/05 23:35:20 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -985,8 +985,7 @@
     strcpy(botuserhost, m->userhost);   /* Yes, save my own userhost */
     m->joined = now;            /* set this to keep the whining masses happy */
   }
-  if ((strchr(flags, '@') != NULL) || (strchr(flags, '&') != NULL) ||
-      (strchr(flags, '~') != NULL))
+  if (strpbrk(flags, opchars) != NULL)
     m->flags |= (CHANOP | WASOP);
   else
     m->flags &= ~(CHANOP | WASOP);
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.97 eggdrop1.6/src/mod/irc.mod/irc.c:1.98
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.97	Thu Jan  8 23:56:38 2004
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Mon Apr  5 18:35:20 2004
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.97 2004/01/09 05:56:38 wcc Exp $
+ * $Id: irc.c,v 1.98 2004/04/05 23:35:20 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -69,6 +69,8 @@
 static int rfc_compliant = 1;   /* Value depends on net-type. */
 static int include_lk = 1;      /* For correct calculation in real_add_mode. */
 
+static char opchars[8];         /* the chars in a /who reply meaning op */
+
 #include "chan.c"
 #include "mode.c"
 #include "cmdsirc.c"
@@ -860,6 +862,11 @@
                  MATCH_MASK | BIND_STACKABLE);
 }
 
+static tcl_strings mystrings[] = {
+  {"opchars", opchars, 7, 0},
+  {NULL,      NULL,    0, 0}
+};
+
 static tcl_ints myints[] = {
   {"learn-users",     &learn_users,     0}, /* arthur2 */
   {"wait-split",      &wait_split,      0},
@@ -1082,6 +1089,7 @@
   del_bind_table(H_pubm);
   del_bind_table(H_pub);
   del_bind_table(H_need);
+  rem_tcl_strings(mystrings);
   rem_tcl_ints(myints);
   rem_builtins(H_dcc, irc_dcc);
   rem_builtins(H_msg, C_msg);
@@ -1175,6 +1183,8 @@
   Tcl_TraceVar(interp, "rfc-compliant",
                TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
                traced_rfccompliant, NULL);
+  strcpy(opchars, "@");
+  add_tcl_strings(mystrings);
   add_tcl_ints(myints);
   add_builtins(H_dcc, irc_dcc);
   add_builtins(H_msg, C_msg);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1061 eggdrop1.6/src/patch.h:1.1062
--- eggdrop1.6/src/patch.h:1.1061	Sun Mar 14 07:52:29 2004
+++ eggdrop1.6/src/patch.h	Mon Apr  5 18:35:20 2004
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1061 2004/03/14 13:52:29 wcc Exp $
+ * $Id: patch.h,v 1.1062 2004/04/05 23:35:20 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1079272325");            /* current unixtime */
+patch("1081208017");            /* current unixtime */
 /*
  *
  *
  */
-patch("wirecrash");
+patch("opchars");
 /*
  *
  *
Index: eggdrop1.6/src/tclhash.c
diff -u eggdrop1.6/src/tclhash.c:1.45 eggdrop1.6/src/tclhash.c:1.46
--- eggdrop1.6/src/tclhash.c:1.45	Thu Jan  8 23:56:37 2004
+++ eggdrop1.6/src/tclhash.c	Mon Apr  5 18:35:20 2004
@@ -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.45 2004/01/09 05:56:37 wcc Exp $
+ * $Id: tclhash.c,v 1.46 2004/04/05 23:35:20 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -759,11 +759,8 @@
         }
       }
 
-      /* Apart from MATCH_MASK, currently no match type allows us to match
-       * against more than one bind. So if this isn't MATCH_MASK then exit
-       * the loop now. */
-      /* This will suffice until we have stackable partials. */
-      if ((match_type & 3) != MATCH_MASK)
+      /* If it's stackable search for more binds. */
+      if (!(match_type & BIND_STACKABLE))
         finish = 1;
     } else {
       /* Search for valid entry. */
----------------------- End of diff -----------------------



More information about the Changes mailing list