[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Tue Jan 30 23:33:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-01-31 05:32:41 UTC

Modified files:
     doc/UPDATES1.6 language/core.english.lang
     language/core.french.lang language/core.german.lang
     src/chanprog.c src/lang.h src/main.c src/main.h src/patch.h

Log message:

added tclstuff.diff -- finally, we can see our tcl version in a .status <g>

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.53 eggdrop1.6/doc/UPDATES1.6:1.54
--- eggdrop1.6/doc/UPDATES1.6:1.53	Fri Jan 26 15:06:13 2001
+++ eggdrop1.6/doc/UPDATES1.6	Tue Jan 30 23:32:30 2001
@@ -4,6 +4,7 @@
 
 1.6.3
 Found by  Fixed by  What...
+          Tothwolf  Improved Tcl version reporting
 habeeb    Sup       Updated the help channels in README.
 PPSlim    PPSlim/   +revengebot no longer requires that the bot has a 
           guppy     user-record for itself.
Index: eggdrop1.6/language/core.english.lang
diff -u eggdrop1.6/language/core.english.lang:1.20 eggdrop1.6/language/core.english.lang:1.21
--- eggdrop1.6/language/core.english.lang:1.20	Tue Nov 28 20:52:05 2000
+++ eggdrop1.6/language/core.english.lang	Tue Jan 30 23:32:31 2001
@@ -1,7 +1,7 @@
 # core.english.lang
 #   core language messages for eggdrop
 #
-# $Id: core.english.lang,v 1.20 2000/11/29 02:52:05 guppy Exp $
+# $Id: core.english.lang,v 1.21 2001/01/31 05:32:31 guppy Exp $
 
 # General stuff
 0x001,Usage
@@ -116,7 +116,7 @@
 0x52c,log dump mode
 0x52d,Online for
 0x52e,cache hit
-0x52f,Using TCL library:
+0x52f,Using Tcl library:
 0x530,New users get flags
 0x531,notify
 0x532,Permanent owner(s)
@@ -137,6 +137,10 @@
 0x541,Last message repeated %d time(s).\n
 0x542,juped
 0x543,No free sockets available.
+0x544,Tcl version:
+0x545,header version
+0x546,Tcl patchlevel:
+0x547,header patchlevel
 
 # IRC_
 0x600,Banned
Index: eggdrop1.6/language/core.french.lang
diff -u eggdrop1.6/language/core.french.lang:1.16 eggdrop1.6/language/core.french.lang:1.17
--- eggdrop1.6/language/core.french.lang:1.16	Tue Nov 28 20:52:05 2000
+++ eggdrop1.6/language/core.french.lang	Tue Jan 30 23:32:31 2001
@@ -1,7 +1,7 @@
 # core.french.lang
 #   core language messages for eggdrop
 #
-# $Id: core.french.lang,v 1.16 2000/11/29 02:52:05 guppy Exp $
+# $Id: core.french.lang,v 1.17 2001/01/31 05:32:31 guppy Exp $
 
 
 # General stuff
@@ -117,7 +117,7 @@
 0x52c,mode log
 0x52d,En ligne depuis
 0x52e,cache hit
-0x52f,Utilisation de la librairie TCL:
+0x52f,Utilisation de la librairie Tcl:
 0x530,Les nouveaux utilisateurs obtiennent les drapeaux
 0x531,annonce
 0x532,Proprietaire(s) permanent(s)
@@ -137,6 +137,11 @@
 0x540,\nSurnom.\n
 0x541,Dernier message repété %d fois.\n
 0x542,bloqué
+0x543,No free sockets available.
+0x544,Tcl version:
+0x545,header version
+0x546,Tcl patchlevel:
+0x547,header patchlevel
 
 # IRC_
 0x600,Banni
Index: eggdrop1.6/language/core.german.lang
diff -u eggdrop1.6/language/core.german.lang:1.18 eggdrop1.6/language/core.german.lang:1.19
--- eggdrop1.6/language/core.german.lang:1.18	Tue Nov 28 20:52:05 2000
+++ eggdrop1.6/language/core.german.lang	Tue Jan 30 23:32:31 2001
@@ -6,7 +6,7 @@
 # Modified by Michael for 1.3.25.
 # Modified by rtc for 1.4.0
 #
-# $Id: core.german.lang,v 1.18 2000/11/29 02:52:05 guppy Exp $
+# $Id: core.german.lang,v 1.19 2001/01/31 05:32:31 guppy Exp $
 
 # General stuff
 0x001,Gebrauch
@@ -126,7 +126,7 @@
 0x52c,Log-Modus
 0x52d,Online seit
 0x52e,Cache-Trefferrate
-0x52f,Benutze TCL Bibliothek:
+0x52f,Benutze Tcl Bibliothek:
 0x530,Neue Benutzer bekommen folgende Flags
 0x531,Benachrichtigung
 0x532,Permanente Botbesitzer
@@ -146,6 +146,10 @@
 0x540,\nNickname.\n
 0x541,Die letzte Meldung wiederholte sich %d mal.\n
 0x543,Keine freien Sockets verfuegbar.
+0x544,Tcl version:
+0x545,header version
+0x546,Tcl patchlevel:
+0x547,header patchlevel
 
 # IRC_
 0x600,gebannt
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.20 eggdrop1.6/src/chanprog.c:1.21
--- eggdrop1.6/src/chanprog.c:1.20	Sun Dec 10 09:10:26 2000
+++ eggdrop1.6/src/chanprog.c	Tue Jan 30 23:32:31 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.20 2000/12/10 15:10:26 guppy Exp $
+ * $Id: chanprog.c,v 1.21 2001/01/31 05:32:31 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -333,8 +333,22 @@
   dprintf(idx, "%s %s  (%s)  %s  %s %4.1f%%\n", MISC_ONLINEFOR,
 	  s, s1, s2, MISC_CACHEHIT,
 	  100.0 * ((float) cache_hit) / ((float) (cache_hit + cache_miss)));
-  if ((interp) && (Tcl_Eval(interp, "info library") == TCL_OK))
-    dprintf(idx, "%s %s\n", MISC_TCLLIBVER, interp->result);
+
+  /* info library */
+  dprintf(idx, "%s %s\n", MISC_TCLLIBRARY,
+	  ((interp) && (Tcl_Eval(interp, "info library") == TCL_OK)) ?
+	  interp->result : "*unknown*");
+
+  /* info tclversion */
+  dprintf(idx, "%s %s (%s %s)\n", MISC_TCLVERSION,
+	  ((interp) && (Tcl_Eval(interp, "info tclversion") == TCL_OK)) ?
+	  interp->result : "*unknown*", MISC_TCLHVERSION, TCL_VERSION);
+
+  /* info patchlevel */
+  dprintf(idx, "%s %s (%s %s)\n", MISC_TCLPATCHLEVEL,
+	  ((interp) && (Tcl_Eval(interp, "info patchlevel") == TCL_OK)) ?
+	  interp->result : "*unknown*", MISC_TCLHPATCHLEVEL,
+	  TCL_PATCH_LEVEL ? TCL_PATCH_LEVEL : "*unknown*");
 }
 
 /* Show all internal state variables
Index: eggdrop1.6/src/lang.h
diff -u eggdrop1.6/src/lang.h:1.19 eggdrop1.6/src/lang.h:1.20
--- eggdrop1.6/src/lang.h:1.19	Tue Nov 28 20:52:05 2000
+++ eggdrop1.6/src/lang.h	Tue Jan 30 23:32:31 2001
@@ -2,7 +2,7 @@
  * lang.h
  *   Conversion definitions for language support
  * 
- * $Id: lang.h,v 1.19 2000/11/29 02:52:05 guppy Exp $
+ * $Id: lang.h,v 1.20 2001/01/31 05:32:31 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -104,7 +104,7 @@
 #define MISC_LOGMODE		get_language(0x52c)
 #define MISC_ONLINEFOR		get_language(0x52d)
 #define MISC_CACHEHIT		get_language(0x52e)
-#define MISC_TCLLIBVER		get_language(0x52f)
+#define MISC_TCLLIBRARY		get_language(0x52f)
 #define MISC_NEWUSERFLAGS	get_language(0x530)
 #define MISC_NOTIFY		get_language(0x531)
 #define MISC_PERMOWNER		get_language(0x532)
@@ -125,6 +125,10 @@
 #define MISC_LOGREPEAT		get_language(0x541)
 #define MISC_JUPED		get_language(0x542)
 #define MISC_NOFREESOCK		get_language(0x543)
+#define MISC_TCLVERSION		get_language(0x544)
+#define MISC_TCLHVERSION	get_language(0x545)
+#define MISC_TCLPATCHLEVEL	get_language(0x546)
+#define MISC_TCLHPATCHLEVEL	get_language(0x547)
 
 /* IRC */
 #define IRC_BANNED		get_language(0x600)
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.50 eggdrop1.6/src/main.c:1.51
--- eggdrop1.6/src/main.c:1.50	Sun Jan 14 21:28:10 2001
+++ eggdrop1.6/src/main.c	Tue Jan 30 23:32:31 2001
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  * 
- * $Id: main.c,v 1.50 2001/01/15 03:28:10 guppy Exp $
+ * $Id: main.c,v 1.51 2001/01/31 05:32:31 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -258,12 +258,33 @@
 #ifdef STATIC
     dprintf(-x, "STATICALLY LINKED\n");
 #endif
-    if (interp && (Tcl_Eval(interp, "info library") == TCL_OK))
-      dprintf(-x, "Using tcl library: %s (header version %s)\n",
-	      interp->result, TCL_VERSION);
+
+    /* info library */
+    dprintf(-x, "Tcl library: %s\n",
+	    ((interp) && (Tcl_Eval(interp, "info library") == TCL_OK)) ?
+	    interp->result : "*unknown*");
+
+    /* info tclversion */
+    dprintf(-x, "Tcl version: %s (header version %s)\n",
+	    ((interp) && (Tcl_Eval(interp, "info tclversion") == TCL_OK)) ?
+	    interp->result : "*unknown*", TCL_VERSION);
+
+    /* info patchlevel */
+    dprintf(-x, "Tcl patchlevel: %s (header patchlevel %s)\n",
+	    ((interp) && (Tcl_Eval(interp, "info patchlevel") == TCL_OK)) ?
+	    interp->result : "*unknown*",
+	    TCL_PATCH_LEVEL ? TCL_PATCH_LEVEL : "*unknown*");
+
+#ifdef CCFLAGS
     dprintf(-x, "Compile flags: %s\n", CCFLAGS);
+#endif
+#ifdef LDFLAGS
     dprintf(-x, "Link flags   : %s\n", LDFLAGS);
+#endif
+#ifdef STRIPFLAGS
     dprintf(-x, "Strip flags  : %s\n", STRIPFLAGS);
+#endif
+
     dprintf(-x, "Context: ");
     cx_ptr = cx_ptr & 15;
     for (y = ((cx_ptr + 1) & 15); y != cx_ptr; y = ((y + 1) & 15))
Index: eggdrop1.6/src/main.h
diff -u eggdrop1.6/src/main.h:1.16 eggdrop1.6/src/main.h:1.17
--- eggdrop1.6/src/main.h:1.16	Fri Nov  3 11:06:35 2000
+++ eggdrop1.6/src/main.h	Tue Jan 30 23:32:31 2001
@@ -2,7 +2,7 @@
  * main.h
  *   include file to include most other include files
  * 
- * $Id: main.h,v 1.16 2000/11/03 17:06:35 fabian Exp $
+ * $Id: main.h,v 1.17 2001/01/31 05:32:31 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -49,11 +49,6 @@
 #  define EGG_VARARGS_START(type, name, list) (va_start(list), va_arg(list,type))
 #endif
 
-/* For pre Tcl7.5p1 versions */
-#ifndef HAVE_TCL_FREE
-#  define Tcl_Free(x) n_free(x, "", 0)
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -61,6 +56,7 @@
 #  include <strings.h>
 #endif
 #include <sys/types.h>
+#include "lush.h"
 #include "lang.h"
 #include "eggdrop.h"
 #include "flags.h"
@@ -73,6 +69,16 @@
 #include "chan.h"
 #include "users.h"
 #include "compat/compat.h"
+
+/* For pre Tcl7.5p1 versions */
+#ifndef HAVE_TCL_FREE
+#  define Tcl_Free(x) n_free(x, "", 0)
+#endif
+
+/* For pre7.6 Tcl versions */
+#ifndef TCL_PATCH_LEVEL
+#  define TCL_PATCH_LEVEL Tcl_GetVar(interp, "tcl_patchLevel", TCL_GLOBAL_ONLY)
+#endif
 
 #ifndef MAKING_MODS
 extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_SCRIPT, DCC_BOT_NEW,
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.422 eggdrop1.6/src/patch.h:1.423
--- eggdrop1.6/src/patch.h:1.422	Fri Jan 26 15:18:22 2001
+++ eggdrop1.6/src/patch.h	Tue Jan 30 23:32:31 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.422 2001/01/26 21:18:22 guppy Exp $
+ * $Id: patch.h,v 1.423 2001/01/31 05:32:31 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("980544254");		/* current unixtime */
+patch("980918871");		/* current unixtime */
 /*
  *
  *
  */
-patch("i18n");
+patch("tclstuff");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list