[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sat Dec 29 15:22:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-29 21:21:28 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

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

Log message:

added my correctname patch from 1.6

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/UPDATES1.6
diff -u eggdrop1.7/doc/UPDATES1.6:1.185 eggdrop1.7/doc/UPDATES1.6:1.186
--- eggdrop1.7/doc/UPDATES1.6:1.185	Sat Dec 29 15:13:25 2001
+++ eggdrop1.7/doc/UPDATES1.6	Sat Dec 29 15:21:17 2001
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.185 2001/12/29 21:13:25 guppy Exp $
+$Id: UPDATES1.6,v 1.186 2001/12/29 21:21:17 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.7/modules/channels/channels.c
diff -u eggdrop1.7/modules/channels/channels.c:1.2 eggdrop1.7/modules/channels/channels.c:1.3
--- eggdrop1.7/modules/channels/channels.c:1.2	Sat Dec  1 11:35:05 2001
+++ eggdrop1.7/modules/channels/channels.c	Sat Dec 29 15:21:17 2001
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.2 2001/12/01 17:35:05 ite Exp $
+ * $Id: channels.c,v 1.3 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -376,7 +376,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.7/modules/irc/chan.c
diff -u eggdrop1.7/modules/irc/chan.c:1.8 eggdrop1.7/modules/irc/chan.c:1.9
--- eggdrop1.7/modules/irc/chan.c:1.8	Sat Dec 29 15:13:26 2001
+++ eggdrop1.7/modules/irc/chan.c	Sat Dec 29 15:21:17 2001
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.8 2001/12/29 21:13:26 guppy Exp $
+ * $Id: chan.c,v 1.9 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -285,7 +285,7 @@
       else
 	putlog(LOG_MISC | LOG_JOIN, chan->dname, _("NICK flood from @%s!  Banning."), 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) {	  
Index: eggdrop1.7/modules/irc/irc.c
diff -u eggdrop1.7/modules/irc/irc.c:1.5 eggdrop1.7/modules/irc/irc.c:1.6
--- eggdrop1.7/modules/irc/irc.c:1.5	Sun Dec  9 20:50:55 2001
+++ eggdrop1.7/modules/irc/irc.c	Sat Dec 29 15:21:17 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.5 2001/12/10 02:50:55 guppy Exp $
+ * $Id: irc.c,v 1.6 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -230,7 +230,7 @@
     baduhost = strtok(NULL, "!");
     maskhost(baduhost, s1);
     simple_sprintf(s2, "(%s) %s", ct, reason);
-    u_addban(chan, s1, origbotname, s2, now + (60 * ban_time), 0);
+    u_addban(chan, s1, botnetnick, s2, now + (60 * ban_time), 0);
     if (!mevictim && me_op(chan)) {
       add_mode(chan, '+', 'b', s1);
       flush_mode(chan, QUICK);
Index: eggdrop1.7/modules/irc/msgcmds.c
diff -u eggdrop1.7/modules/irc/msgcmds.c:1.3 eggdrop1.7/modules/irc/msgcmds.c:1.4
--- eggdrop1.7/modules/irc/msgcmds.c:1.3	Wed Dec 19 00:25:08 2001
+++ eggdrop1.7/modules/irc/msgcmds.c	Sat Dec 29 15:21:17 2001
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.3 2001/12/19 06:25:08 guppy Exp $
+ * $Id: msgcmds.c,v 1.4 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -94,7 +94,7 @@
     putlog(LOG_MISC, "*", _("Bot installation complete, first master is %s"), handle);
     make_userfile = 0;
     write_userfile(-1);
-    add_note(handle, origbotname, _("Welcome to Eggdrop! =]"), -1, 0);
+    add_note(handle, botnetnick, _("Welcome to Eggdrop! =]"), -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.7/modules/server/servmsg.c
diff -u eggdrop1.7/modules/server/servmsg.c:1.7 eggdrop1.7/modules/server/servmsg.c:1.8
--- eggdrop1.7/modules/server/servmsg.c:1.7	Wed Dec 19 18:42:21 2001
+++ eggdrop1.7/modules/server/servmsg.c	Sat Dec 29 15:21:17 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.7 2001/12/20 00:42:21 stdarg Exp $
+ * $Id: servmsg.c,v 1.8 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -334,7 +334,7 @@
     /* Private msg */
     simple_sprintf(h, "*!*@%s", p);
     putlog(LOG_MISC, "*", _("Flood from @%s!  Placing on ignore!"), 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;
Index: eggdrop1.7/modules/share/share.c
diff -u eggdrop1.7/modules/share/share.c:1.4 eggdrop1.7/modules/share/share.c:1.5
--- eggdrop1.7/modules/share/share.c:1.4	Sat Dec  8 10:39:54 2001
+++ eggdrop1.7/modules/share/share.c	Sat Dec 29 15:21:17 2001
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.4 2001/12/08 16:39:54 ite Exp $
+ * $Id: share.c,v 1.5 2001/12/29 21:21:17 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1591,7 +1591,7 @@
     putlog(LOG_MISC, "*", _("ERROR writing user file to transfer."));
   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.7/src/chanprog.c
diff -u eggdrop1.7/src/chanprog.c:1.38 eggdrop1.7/src/chanprog.c:1.39
--- eggdrop1.7/src/chanprog.c:1.38	Sun Dec  9 08:14:47 2001
+++ eggdrop1.7/src/chanprog.c	Sat Dec 29 15:21:18 2001
@@ -4,7 +4,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.38 2001/12/09 14:14:47 ite Exp $
+ * $Id: chanprog.c,v 1.39 2001/12/29 21:21:18 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -364,6 +364,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(_("STARTING BOT IN USERFILE CREATION MODE.\n\
 Telnet to the bot and enter 'NEW' as your nickname."), 0);
@@ -377,7 +382,7 @@
     printf(_("\n\nSTARTING BOT IN USERFILE CREATION MODE.\n\
 Telnet to the bot and enter 'NEW' as your nickname.\n"));
     if (module_find("server", 0, 0))
-      printf(_("OR Go to IRC and:  /msg %s hello\n"), origbotname);
+      printf(_("OR Go to IRC and:  /msg %s hello\n"), botnetnick);
     printf(_("This will make the bot recognize you as the master.\n\n"));
   } else if (make_userfile) {
      make_userfile = 0;
@@ -389,11 +394,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.7/src/main.c
diff -u eggdrop1.7/src/main.c:1.102 eggdrop1.7/src/main.c:1.103
--- eggdrop1.7/src/main.c:1.102	Tue Dec 25 23:03:02 2001
+++ eggdrop1.7/src/main.c	Sat Dec 29 15:21:18 2001
@@ -4,7 +4,7 @@
  *   signal handling
  *   command line arguments
  *
- * $Id: main.c,v 1.102 2001/12/26 05:03:02 tothwolf Exp $
+ * $Id: main.c,v 1.103 2001/12/29 21:21:18 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -601,7 +601,7 @@
     kill(xx, SIGCHLD);		/* Meaningless kill to determine if pid
 				   is used */
     if (errno != ESRCH) {
-      printf(_("I detect %s already running from this directory.\n"), origbotname);
+      printf(_("I detect %s already running from this directory.\n"), botnetnick);
       printf(_("If this is incorrect, erase the %s\n"), pid_file);
       bg_send_quit(BG_ABORT);
       exit(1);
@@ -830,7 +830,7 @@
 	    }
 	    if (ok) {
 	      strcpy(xx, p->name);
-	      if (module_unload(xx, origbotname) == NULL) {
+	      if (module_unload(xx, botnetnick) == NULL) {
 		f = 1;
 		break;
 	      }
Index: eggdrop1.7/src/patch.h
diff -u eggdrop1.7/src/patch.h:1.570 eggdrop1.7/src/patch.h:1.571
--- eggdrop1.7/src/patch.h:1.570	Sat Dec 29 15:13:26 2001
+++ eggdrop1.7/src/patch.h	Sat Dec 29 15:21:18 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.570 2001/12/29 21:13:26 guppy Exp $
+ * $Id: patch.h,v 1.571 2001/12/29 21:21:18 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,17 +41,17 @@
  *
  *
  */
-patch("1009660165");		/* current unixtime */
+patch("1009660569");		/* current unixtime */
 /*
  *
  *
  */
-patch("onopmodefix1and2");
+patch("correctname");
 /*
  *
  *
  */
-patch("onopmodefix1and2");
+patch("correctname");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list