[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sat Sep 29 01:34:00 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-09-29 06:33:31 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/mem.c src/patch.h src/tclmisc.c

Log message:

tothwolf's memory patch ... lets go 1.6.7

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.186 eggdrop1.6/doc/UPDATES1.6:1.187
--- eggdrop1.6/doc/UPDATES1.6:1.186	Fri Sep 28 09:07:25 2001
+++ eggdrop1.6/doc/UPDATES1.6	Sat Sep 29 01:33:20 2001
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.186 2001/09/28 14:07:25 guppy Exp $
+$Id: UPDATES1.6,v 1.187 2001/09/29 06:33:20 guppy Exp $
 
 Changes in eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.7
 Found by  Fixed by  What...
+          Tothwolf  added missing memory check for tclmisc.c
 Tothwolf  guppy     new setting: pidfile (detaults to pid.botnetnick)
           poptix    oops, .kickban -nick didn't work.
           BarkerJr  backported a check for -dynamicbans to new[ban|exempt|invite]
Index: eggdrop1.6/src/mem.c
diff -u eggdrop1.6/src/mem.c:1.15 eggdrop1.6/src/mem.c:1.16
--- eggdrop1.6/src/mem.c:1.15	Wed Apr 11 21:39:43 2001
+++ eggdrop1.6/src/mem.c	Sat Sep 29 01:33:20 2001
@@ -3,7 +3,7 @@
  *   memory allocation and deallocation
  *   keeping track of what memory is being used by whom
  *
- * $Id: mem.c,v 1.15 2001/04/12 02:39:43 guppy Exp $
+ * $Id: mem.c,v 1.16 2001/09/29 06:33:20 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -60,6 +60,7 @@
 int expmem_botnet();
 int expmem_tcl();
 int expmem_tclhash();
+int expmem_tclmisc();
 int expmem_net();
 int expmem_modules();
 int expmem_language();
@@ -116,7 +117,7 @@
 void debug_mem_to_dcc(int idx)
 {
 #ifdef DEBUG_MEM
-#define MAX_MEM 12
+#define MAX_MEM 13
   unsigned long exp[MAX_MEM], use[MAX_MEM], l;
   int i, j;
   char fn[20], sofar[81];
@@ -132,9 +133,10 @@
   exp[6] = expmem_botnet();
   exp[7] = expmem_tcl();
   exp[8] = expmem_tclhash();
-  exp[9] = expmem_modules(1);
-  exp[10] = expmem_tcldcc();
-  exp[11] = expmem_dns();
+  exp[9] = expmem_tclmisc();
+  exp[10] = expmem_modules(1);
+  exp[11] = expmem_tcldcc();
+  exp[12] = expmem_dns();
   for (me = module_list; me; me = me->next)
     me->mem_work = 0;
   for (i = 0; i < MAX_MEM; i++)
@@ -163,12 +165,14 @@
       use[7] += l;
     else if (!strcmp(fn, "tclhash.c"))
       use[8] += l;
-    else if (!strcmp(fn, "modules.c"))
+    else if (!strcmp(fn, "tclmisc.c"))
       use[9] += l;
-    else if (!strcmp(fn, "tcldcc.c"))
+    else if (!strcmp(fn, "modules.c"))
       use[10] += l;
-    else if (!strcmp(fn, "dns.c"))
+    else if (!strcmp(fn, "tcldcc.c"))
       use[11] += l;
+    else if (!strcmp(fn, "dns.c"))
+      use[12] += l;
     else if (p) {
       for (me = module_list; me; me = me->next)
 	if (!strcmp(fn, me->name))
@@ -206,12 +210,15 @@
       strcpy(fn, "tclhash.c");
       break;
     case 9:
-      strcpy(fn, "modules.c");
+      strcpy(fn, "tclmisc.c");
       break;
     case 10:
-      strcpy(fn, "tcldcc.c");
+      strcpy(fn, "modules.c");
       break;
     case 11:
+      strcpy(fn, "tcldcc.c");
+      break;
+    case 12:
       strcpy(fn, "dns.c");
       break;
     }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.559 eggdrop1.6/src/patch.h:1.560
--- eggdrop1.6/src/patch.h:1.559	Fri Sep 28 09:07:26 2001
+++ eggdrop1.6/src/patch.h	Sat Sep 29 01:33:20 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.559 2001/09/28 14:07:26 guppy Exp $
+ * $Id: patch.h,v 1.560 2001/09/29 06:33:20 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1001685847");		/* current unixtime */
+patch("1001743626");		/* current unixtime */
 /*
  *
  *
  */
-patch("pidfile");
+patch("utf8-mem-fix");
 /*
  *
  *
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.25 eggdrop1.6/src/tclmisc.c:1.26
--- eggdrop1.6/src/tclmisc.c:1.25	Tue Sep 25 18:21:44 2001
+++ eggdrop1.6/src/tclmisc.c	Sat Sep 29 01:33:21 2001
@@ -3,7 +3,7 @@
  *   Tcl stubs for file system commands
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.25 2001/09/25 23:21:44 guppy Exp $
+ * $Id: tclmisc.c,v 1.26 2001/09/29 06:33:21 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -43,6 +43,18 @@
 extern int max_logs;
 extern log_t *logs;
 extern Tcl_Interp *interp;
+
+int expmem_tclmisc()
+{
+  int i, tot = 0;
+
+  for (i = 0; i < max_logs; i++)
+    if (logs[i].filename != NULL) {
+      tot += strlen(logs[i].filename) + 1;
+      tot += strlen(logs[i].chname) + 1;
+    }
+  return tot;
+}
 
 /*
  *      Logging
----------------------- End of diff -----------------------



More information about the Changes mailing list