[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sat Dec 22 14:26:02 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-12-22 20:25:27 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/chanprog.c src/main.c src/patch.h
     src/tclmisc.c src/mod/channels.mod/channels.c
     src/mod/irc.mod/chan.c src/mod/irc.mod/irc.c
     src/mod/irc.mod/msgcmds.c src/mod/server.mod/servmsg.c
     src/mod/share.mod/share.c

Log message:

added my correctname patch

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.269 eggdrop1.6/doc/UPDATES1.6:1.270
--- eggdrop1.6/doc/UPDATES1.6:1.269	Fri Dec 21 23:02:00 2001
+++ eggdrop1.6/doc/UPDATES1.6	Sat Dec 22 14:25:15 2001
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.269 2001/12/22 05:02:00 guppy Exp $
+$Id: UPDATES1.6,v 1.270 2001/12/22 20:25:15 guppy Exp $
 
 Changes in eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.8
 Found by  Fixed by  What...
+          guppy     origbotname was being wrongly used in some locations
           guppy     fixed a bug that prevented MODE from being sent when we get ops on a
                     channel to retrieve the proper channel key
 VYOinlove guppy     don't try to open a dcc chat when people do /ctcp <bot> chat without a
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.26 eggdrop1.6/src/chanprog.c:1.27
--- eggdrop1.6/src/chanprog.c:1.26	Sun Sep 23 23:25:39 2001
+++ eggdrop1.6/src/chanprog.c	Sat Dec 22 14:25:16 2001
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.26 2001/09/24 04:25:39 guppy Exp $
+ * $Id: chanprog.c,v 1.27 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -448,6 +448,11 @@
   /* We should be safe now */
   call_hook(HOOK_REHASH);
   protect_readonly = 1;
+  if (!botnetnick[0]) {
+    strncpyz(botnetnick, origbotname, HANDLEN + 1);
+  }
+  if (!botnetnick[0])
+    fatal("I don't have a botnet nick!!\n", 0);
   if (!userfile[0])
     fatal(MISC_NOUSERFILE2, 0);
   if (!readuserfile(userfile, &userlist)) {
@@ -459,7 +464,7 @@
     }
     printf("\n\n%s\n", MISC_NOUSERFILE2);
     if (module_find("server", 0, 0))
-      printf(MISC_USERFCREATE1, origbotname);
+      printf(MISC_USERFCREATE1, botnetnick);
     printf("%s\n\n", MISC_USERFCREATE2);
   } else if (make_userfile) {
      make_userfile = 0;
@@ -471,11 +476,6 @@
   if (tempdir[0])
     if (tempdir[strlen(tempdir) - 1] != '/')
       strcat(tempdir, "/");
-  if (!botnetnick[0]) {
-    strncpyz(botnetnick, origbotname, HANDLEN + 1);
-  }
-  if (!botnetnick[0])
-    fatal("I don't have a botnet nick!!\n", 0);
   /* Test tempdir: it's vital */
   {
     FILE *f;
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.75 eggdrop1.6/src/main.c:1.76
--- eggdrop1.6/src/main.c:1.75	Fri Dec  7 14:14:45 2001
+++ eggdrop1.6/src/main.c	Sat Dec 22 14:25:16 2001
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.75 2001/12/07 20:14:45 guppy Exp $
+ * $Id: main.c,v 1.76 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -815,7 +815,7 @@
     kill(xx, SIGCHLD);		/* Meaningless kill to determine if pid
 				   is used */
     if (errno != ESRCH) {
-      printf(EGG_RUNNING1, origbotname);
+      printf(EGG_RUNNING1, botnetnick);
       printf(EGG_RUNNING2, pid_file);
       bg_send_quit(BG_ABORT);
       exit(1);
@@ -1041,7 +1041,7 @@
 	    }
 	    if (ok) {
 	      strcpy(xx, p->name);
-	      if (module_unload(xx, origbotname) == NULL) {
+	      if (module_unload(xx, botnetnick) == NULL) {
 		f = 1;
 		break;
 	      }
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.57 eggdrop1.6/src/mod/channels.mod/channels.c:1.58
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.57	Wed Nov 28 17:17:41 2001
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Sat Dec 22 14:25:16 2001
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.57 2001/11/28 23:17:41 guppy Exp $
+ * $Id: channels.c,v 1.58 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -387,7 +387,7 @@
   if (!quiet_save)
     putlog(LOG_MISC, "*", "Writing channel file ...");
   fprintf(f, "#Dynamic Channel File for %s (%s) -- written %s\n",
-	  origbotname, ver, ctime(&now));
+	  botnetnick, ver, ctime(&now));
   for (chan = chanset; chan; chan = chan->next) {
     convert_element(chan->dname, name);
     get_mode_protect(chan, w);
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.77 eggdrop1.6/src/mod/irc.mod/chan.c:1.78
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.77	Sat Dec 22 00:43:57 2001
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Sat Dec 22 14:25:16 2001
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.77 2001/12/22 06:43:57 guppy Exp $
+ * $Id: chan.c,v 1.78 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -285,7 +285,7 @@
       else
 	putlog(LOG_MISC | LOG_JOIN, chan->dname, IRC_FLOODIGNORE4, p);
       strcpy(ftype + 4, " flood");
-      u_addban(chan, h, origbotname, ftype, now + (60 * ban_time), 0);
+      u_addban(chan, h, botnetnick, ftype, now + (60 * ban_time), 0);
       if (!channel_enforcebans(chan) && me_op(chan)) {
 	  char s[UHOSTLEN];
 	  for (m = chan->channel.member; m && m->nick[0]; m = m->next) {	  
@@ -2029,7 +2029,7 @@
 	   u_match_mask(chan->exempts, from)))) {
       if (ban_fun) {
 	check_exemptlist(chan, from);
-	u_addban(chan, quickban(chan, uhost), origbotname,
+	u_addban(chan, quickban(chan, uhost), botnetnick,
 		IRC_FUNKICK, now + (60 * ban_time), 0);
       }
       if (kick_fun) {
@@ -2048,7 +2048,7 @@
       else
 	p = uhost;
       simple_sprintf(buf2, "*!*@%s", p);
-      addignore(buf2, origbotname, "ctcp avalanche", now + (60 * ignore_time));
+      addignore(buf2, botnetnick, "ctcp avalanche", now + (60 * ignore_time));
     }
     return 0;
   }
@@ -2165,7 +2165,7 @@
 	   u_match_mask(chan->exempts, from)))) {
       if (ban_fun) {
 	check_exemptlist(chan, from);
-	u_addban(chan, quickban(chan, uhost), origbotname,
+	u_addban(chan, quickban(chan, uhost), botnetnick,
 		IRC_FUNKICK, now + (60 * ban_time), 0);
       }
       if (kick_fun) {
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.59 eggdrop1.6/src/mod/irc.mod/irc.c:1.60
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.59	Wed Dec  5 22:57:17 2001
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Sat Dec 22 14:25:16 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.59 2001/12/06 04:57:17 guppy Exp $
+ * $Id: irc.c,v 1.60 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -224,7 +224,7 @@
     splitnick(&whobad);
     maskhost(whobad, s1);
     simple_sprintf(s, "(%s) %s", ct, reason);
-    u_addban(chan, s1, origbotname, s, now + (60 * ban_time), 0);
+    u_addban(chan, s1, botnetnick, s, now + (60 * ban_time), 0);
     if (!mevictim && me_op(chan)) {
       add_mode(chan, '+', 'b', s1);
       flush_mode(chan, QUICK);
Index: eggdrop1.6/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.26 eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.27
--- eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.26	Sun Dec 16 08:56:00 2001
+++ eggdrop1.6/src/mod/irc.mod/msgcmds.c	Sat Dec 22 14:25:16 2001
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.26 2001/12/16 14:56:00 guppy Exp $
+ * $Id: msgcmds.c,v 1.27 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -94,7 +94,7 @@
     putlog(LOG_MISC, "*", IRC_INIT1, handle);
     make_userfile = 0;
     write_userfile(-1);
-    add_note(handle, origbotname, IRC_INITNOTE, -1, 0);
+    add_note(handle, botnetnick, IRC_INITNOTE, -1, 0);
   } else {
     fr.global = default_flags;
 
@@ -114,7 +114,7 @@
 	rmspace(p1);
       }
       rmspace(s1);
-      add_note(s1, origbotname, s, -1, 0);
+      add_note(s1, botnetnick, s, -1, 0);
       if (p1 == NULL)
 	s1[0] = 0;
       else
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.61 eggdrop1.6/src/mod/server.mod/servmsg.c:1.62
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.61	Mon Oct 29 21:01:02 2001
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Sat Dec 22 14:25:16 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.61 2001/10/30 03:01:02 guppy Exp $
+ * $Id: servmsg.c,v 1.62 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -392,7 +392,7 @@
     /* Private msg */
     simple_sprintf(h, "*!*@%s", p);
     putlog(LOG_MISC, "*", IRC_FLOODIGNORE1, p);
-    addignore(h, origbotname, (which == FLOOD_CTCP) ? "CTCP flood" :
+    addignore(h, botnetnick, (which == FLOOD_CTCP) ? "CTCP flood" :
 	      "MSG/NOTICE flood", now + (60 * ignore_time));
   }
   return 0;
@@ -443,7 +443,7 @@
       else
 	p = uhost;
       simple_sprintf(ctcpbuf, "*!*@%s", p);
-      addignore(ctcpbuf, origbotname, "ctcp avalanche",
+      addignore(ctcpbuf, botnetnick, "ctcp avalanche",
 		now + (60 * ignore_time));
     }
   }
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.58 eggdrop1.6/src/mod/share.mod/share.c:1.59
--- eggdrop1.6/src/mod/share.mod/share.c:1.58	Sun Dec  2 21:02:41 2001
+++ eggdrop1.6/src/mod/share.mod/share.c	Sat Dec 22 14:25:17 2001
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.58 2001/12/03 03:02:41 guppy Exp $
+ * $Id: share.c,v 1.59 2001/12/22 20:25:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1600,7 +1600,7 @@
     putlog(LOG_MISC, "*", USERF_ERRWRITE2);
   else {
     chmod(fn, 0600);		/* make it -rw------- */
-    fprintf(f, "#4v: %s -- %s -- transmit\n", ver, origbotname);
+    fprintf(f, "#4v: %s -- %s -- transmit\n", ver, botnetnick);
     ok = 1;
     for (u = bu; u && ok; u = u->next)
       ok = write_user(u, f, idx);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.647 eggdrop1.6/src/patch.h:1.648
--- eggdrop1.6/src/patch.h:1.647	Sat Dec 22 00:43:57 2001
+++ eggdrop1.6/src/patch.h	Sat Dec 22 14:25:16 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.647 2001/12/22 06:43:57 guppy Exp $
+ * $Id: patch.h,v 1.648 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1009003297");		/* current unixtime */
+patch("1009052334");		/* current unixtime */
 /*
  *
  *
  */
-patch("onopmodefix2");
+patch("correctname");
 /*
  *
  *
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.27 eggdrop1.6/src/tclmisc.c:1.28
--- eggdrop1.6/src/tclmisc.c:1.27	Thu Dec 20 01:51:26 2001
+++ eggdrop1.6/src/tclmisc.c	Sat Dec 22 14:25:16 2001
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.27 2001/12/20 07:51:26 guppy Exp $
+ * $Id: tclmisc.c,v 1.28 2001/12/22 20:25:16 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -484,7 +484,7 @@
 static int tcl_unloadmodule STDVAR
 {
   BADARGS(2, 2, " module-name");
-  Tcl_AppendResult(irp, module_unload(argv[1], origbotname), NULL);
+  Tcl_AppendResult(irp, module_unload(argv[1], botnetnick), NULL);
   return TCL_OK;
 }
 
----------------------- End of diff -----------------------



More information about the Changes mailing list