[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Wed Oct 10 12:03:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-10 17:02:16 UTC
Commited by: stdarg

Modified files:
     src/mod/channels.mod/tclchan.c src/mod/irc.mod/irc.c
     src/mod/irc.mod/irc.h src/mod/irc.mod/mode.c

Log message:

Applied stuff from Bastian Blank:
diff1: ircnet (net-type == 1) specific settings the bits are set
       in chan.status not in chan.ircnet_status
diff2: gotmode have false arguments, it don't get the real mode change
diff3: BT_kick isn't initialized so eggdrop want to dereference 0x0

---------------------- diff included ----------------------
Index: eggdrop1.7/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.7/src/mod/channels.mod/tclchan.c:1.54 eggdrop1.7/src/mod/channels.mod/tclchan.c:1.55
--- eggdrop1.7/src/mod/channels.mod/tclchan.c:1.54	Wed Oct 10 05:44:05 2001
+++ eggdrop1.7/src/mod/channels.mod/tclchan.c	Wed Oct 10 12:02:06 2001
@@ -1,7 +1,7 @@
 /*
  * tclchan.c -- part of channels.mod
  *
- * $Id: tclchan.c,v 1.54 2001/10/10 10:44:05 tothwolf Exp $
+ * $Id: tclchan.c,v 1.55 2001/10/10 17:02:06 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -987,8 +987,8 @@
         else chan->status |= flagval;
       }
       else if (lookup_flag_by_name(stupid_ircnet_flag_map, item[i]+1, &flagval)) {
-        if (item[i][0] == '-') chan->status &= ~flagval;
-        else chan->status |= flagval;
+        if (item[i][0] == '-') chan->ircnet_status &= ~flagval;
+        else chan->ircnet_status |= flagval;
       }
       else {
         /* Hopefully it's a user-defined flag! */
Index: eggdrop1.7/src/mod/irc.mod/irc.c
diff -u eggdrop1.7/src/mod/irc.mod/irc.c:1.65 eggdrop1.7/src/mod/irc.mod/irc.c:1.66
--- eggdrop1.7/src/mod/irc.mod/irc.c:1.65	Wed Oct 10 05:44:06 2001
+++ eggdrop1.7/src/mod/irc.mod/irc.c	Wed Oct 10 12:02:06 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.65 2001/10/10 10:44:06 tothwolf Exp $
+ * $Id: irc.c,v 1.66 2001/10/10 17:02:06 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1045,6 +1045,7 @@
   BT_part = add_bind_table2("part", 5, "ssUss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
   BT_nick = add_bind_table2("nick", 5, "ssUss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
   BT_mode = add_bind_table2("mode", 6, "ssUsss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
+  BT_kick = add_bind_table2("kick", 6, "ssUsss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
   BT_need = add_bind_table2("need", 2, "ss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
   BT_pub = add_bind_table2("pub", 5, "ssUss", 0, BIND_USE_ATTR);
   BT_pubm = add_bind_table2("pubm", 5, "ssUss", MATCH_MASK, BIND_STACKABLE | BIND_USE_ATTR);
Index: eggdrop1.7/src/mod/irc.mod/irc.h
diff -u eggdrop1.7/src/mod/irc.mod/irc.h:1.16 eggdrop1.7/src/mod/irc.mod/irc.h:1.17
--- eggdrop1.7/src/mod/irc.mod/irc.h:1.16	Sat Oct  6 23:02:55 2001
+++ eggdrop1.7/src/mod/irc.mod/irc.h	Wed Oct 10 12:02:06 2001
@@ -1,7 +1,7 @@
 /*
  * irc.h -- part of irc.mod
  *
- * $Id: irc.h,v 1.16 2001/10/07 04:02:55 stdarg Exp $
+ * $Id: irc.h,v 1.17 2001/10/10 17:02:06 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -76,7 +76,7 @@
  		   struct userrec *opu, struct flag_record *opper);
 static int killmember(struct chanset_t *chan, char *nick);
 static void check_lonely_channel(struct chanset_t *chan);
-static int gotmode(char *, char *);
+static int gotmode(char *, char *, char *);
 
 #define newban(chan, mask, who)         newmask((chan)->channel.ban, mask, who)
 #define newexempt(chan, mask, who)      newmask((chan)->channel.exempt, mask, \
Index: eggdrop1.7/src/mod/irc.mod/mode.c
diff -u eggdrop1.7/src/mod/irc.mod/mode.c:1.50 eggdrop1.7/src/mod/irc.mod/mode.c:1.51
--- eggdrop1.7/src/mod/irc.mod/mode.c:1.50	Wed Oct 10 05:44:07 2001
+++ eggdrop1.7/src/mod/irc.mod/mode.c	Wed Oct 10 12:02:06 2001
@@ -4,7 +4,7 @@
  *   channel mode changes and the bot's reaction to them
  *   setting and getting the current wanted channel modes
  *
- * $Id: mode.c,v 1.50 2001/10/10 10:44:07 tothwolf Exp $
+ * $Id: mode.c,v 1.51 2001/10/10 17:02:06 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -854,7 +854,7 @@
   }
 }
 
-static int gotmode(char *from, char *origmsg)
+static int gotmode(char *from, char *ignore, char *origmsg)
 {
   char *nick, *ch, *op, *chg, *msg;
   char s[UHOSTLEN], buf[511];
----------------------- End of diff -----------------------



More information about the Changes mailing list