From 9aa711e8e0c11bcdda23542d82c44a773e07251c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Aug 2012 06:49:25 +0000
Subject: remove unnecessary struct names, which only pollute the "struct"
 namespace for te compiler.

---
 generic/regc_locale.c        |  2 +-
 generic/tcl.h                |  2 +-
 generic/tclBasic.c           |  2 +-
 generic/tclBinary.c          |  2 +-
 generic/tclCkalloc.c         |  2 +-
 generic/tclClock.c           |  4 ++--
 generic/tclCmdIL.c           |  2 +-
 generic/tclCompExpr.c        |  2 +-
 generic/tclCompile.h         |  8 ++++----
 generic/tclConfig.c          |  2 +-
 generic/tclEncoding.c        |  8 ++++----
 generic/tclEvent.c           |  2 +-
 generic/tclExecute.c         |  2 +-
 generic/tclIO.c              |  2 +-
 generic/tclIOCmd.c           |  4 ++--
 generic/tclIORChan.c         |  8 ++++----
 generic/tclIORTrans.c        |  8 ++++----
 generic/tclIOUtil.c          |  4 ++--
 generic/tclInterp.c          | 16 ++++++++--------
 generic/tclLink.c            |  2 +-
 generic/tclMain.c            |  2 +-
 generic/tclNamesp.c          |  4 ++--
 generic/tclObj.c             |  2 +-
 generic/tclPathObj.c         |  2 +-
 generic/tclPkg.c             |  2 +-
 generic/tclPreserve.c        |  2 +-
 generic/tclRegexp.c          |  2 +-
 generic/tclResult.c          |  2 +-
 generic/tclScan.c            |  2 +-
 generic/tclStringObj.c       |  2 +-
 generic/tclTest.c            |  6 +++---
 generic/tclTestObj.c         |  2 +-
 generic/tclTestProcBodyObj.c |  2 +-
 generic/tclThreadAlloc.c     |  2 +-
 generic/tclThreadStorage.c   |  2 +-
 generic/tclThreadTest.c      |  2 +-
 generic/tclTimer.c           |  2 +-
 generic/tclTrace.c           |  2 +-
 unix/tclUnixChan.c           |  4 ++--
 unix/tclUnixCompat.c         |  2 +-
 unix/tclUnixInit.c           |  8 ++++----
 unix/tclUnixNotfy.c          |  4 ++--
 unix/tclUnixPipe.c           |  2 +-
 unix/tclUnixTest.c           |  2 +-
 unix/tclUnixThrd.c           |  8 ++++----
 unix/tclUnixTime.c           |  2 +-
 win/tclWinChan.c             |  4 ++--
 win/tclWinConsole.c          |  6 +++---
 win/tclWinDde.c              | 24 ++++++++++++------------
 win/tclWinNotify.c           |  2 +-
 win/tclWinPipe.c             |  6 +++---
 win/tclWinSerial.c           |  4 ++--
 win/tclWinSock.c             |  4 ++--
 win/tclWinThrd.c             |  8 ++++----
 win/tclWinTime.c             |  4 ++--
 55 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index 40791f4..d01888b 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -118,7 +118,7 @@ static const struct cname {
  * Unicode character-class tables.
  */
 
-typedef struct crange {
+typedef struct {
     chr start;
     chr end;
 } crange;
diff --git a/generic/tcl.h b/generic/tcl.h
index 729e521..7a026ed 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -458,7 +458,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 	typedef struct _stat32i64 Tcl_StatBuf;
 #   endif /* _MSC_VER < 1400 */
 #elif defined(__CYGWIN__)
-    typedef struct _stat32i64 {
+    typedef struct {
 	dev_t st_dev;
 	unsigned short st_ino;
 	unsigned short st_mode;
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index db365e3..d47d96f 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -45,7 +45,7 @@
  * registered with Tcl_CreateMathFunc
  */
 
-typedef struct OldMathFuncData {
+typedef struct {
     Tcl_MathProc *proc;		/* Handler function */
     int numArgs;		/* Number of args expected */
     Tcl_ValueType *argTypes;	/* Types of the args */
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index a1e836e..5e1114d 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -167,7 +167,7 @@ const Tcl_ObjType tclByteArrayType = {
  * fewer mallocs.
  */
 
-typedef struct ByteArray {
+typedef struct {
     int used;			/* The number of bytes used in the byte
 				 * array. */
     int allocated;		/* The amount of space actually allocated
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index ab977cb..2268e45 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -33,7 +33,7 @@
  * "memory tag" command is invoked, to hold the current tag.
  */
 
-typedef struct MemTag {
+typedef struct {
     int refCount;		/* Number of mem_headers referencing this
 				 * tag. */
     char string[1];		/* Actual size of string will be as large as
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 6d2976d..1257231 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -91,7 +91,7 @@ static const char *const literals[] = {
  * Structure containing the client data for [clock]
  */
 
-typedef struct ClockClientData {
+typedef struct {
     int refCount;		/* Number of live references. */
     Tcl_Obj **literals;		/* Pool of object literals. */
 } ClockClientData;
@@ -100,7 +100,7 @@ typedef struct ClockClientData {
  * Structure containing the fields used in [clock format] and [clock scan]
  */
 
-typedef struct TclDateFields {
+typedef struct {
     Tcl_WideInt seconds;	/* Time expressed in seconds from the Posix
 				 * epoch */
     Tcl_WideInt localSeconds;	/* Local time expressed in nominal seconds
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 14e0092..c0c1030 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -56,7 +56,7 @@ typedef int (*SortMemCmpFn_t) (const void *, const void *, size_t);
  * The following structure is used to pass this information.
  */
 
-typedef struct SortInfo {
+typedef struct {
     int isIncreasing;		/* Nonzero means sort in increasing order. */
     int sortMode;		/* The sort mode. One of SORTMODE_* values
 				 * defined below. */
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 890d518..c7aebba 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -22,7 +22,7 @@
  * The tree is composed of OpNodes.
  */
 
-typedef struct OpNode {
+typedef struct {
     int left;			/* "Pointer" to the left operand. */
     int right;			/* "Pointer" to the right operand. */
     union {
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index ba78c36..82a4218 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -80,7 +80,7 @@ typedef enum {
 				 * to a catch PC offset. */
 } ExceptionRangeType;
 
-typedef struct ExceptionRange {
+typedef struct {
     ExceptionRangeType type;	/* The kind of ExceptionRange. */
     int nestingLevel;		/* Static depth of the exception range. Used
 				 * to find the most deeply-nested range
@@ -107,7 +107,7 @@ typedef struct ExceptionRange {
  * source offset is not monotonic.
  */
 
-typedef struct CmdLocation {
+typedef struct {
     int codeOffset;		/* Offset of first byte of command code. */
     int numCodeBytes;		/* Number of bytes for command's code. */
     int srcOffset;		/* Offset of first char of the command. */
@@ -125,7 +125,7 @@ typedef struct CmdLocation {
  * frame and associated information, like the path of a sourced file.
  */
 
-typedef struct ECL {
+typedef struct {
     int srcOffset;		/* Command location to find the entry. */
     int nline;			/* Number of words in the command */
     int *line;			/* Line information for all words in the
@@ -135,7 +135,7 @@ typedef struct ECL {
 				 * lines. */
 } ECL;
 
-typedef struct ExtCmdLoc {
+typedef struct {
     int type;			/* Context type. */
     int start;			/* Starting line for compiled script. Needed
 				 * for the extended recompile check in
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index a4ba71a..fe99bbb 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -31,7 +31,7 @@
  * and the (Tcl_Interp *) in which it is stored.
  */
 
-typedef struct QCCD {
+typedef struct {
     Tcl_Obj *pkg;
     Tcl_Interp *interp;
 } QCCD;
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7a55724..8f30471 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -18,7 +18,7 @@ typedef size_t (LengthProc)(const char *src);
  * convert between various character sets and UTF-8.
  */
 
-typedef struct Encoding {
+typedef struct {
     char *name;			/* Name of encoding. Malloced because (1) hash
 				 * table entry that owns this encoding may be
 				 * freed prior to this encoding being freed,
@@ -57,7 +57,7 @@ typedef struct Encoding {
  * encoding.
  */
 
-typedef struct TableEncodingData {
+typedef struct {
     int fallback;		/* Character (in this encoding) to substitute
 				 * when this encoding cannot represent a UTF-8
 				 * character. */
@@ -91,7 +91,7 @@ typedef struct TableEncodingData {
  * for switching character sets.
  */
 
-typedef struct EscapeSubTable {
+typedef struct {
     unsigned sequenceLen;	/* Length of following string. */
     char sequence[16];		/* Escape code that marks this encoding. */
     char name[32];		/* Name for encoding. */
@@ -100,7 +100,7 @@ typedef struct EscapeSubTable {
 				 * yet. */
 } EscapeSubTable;
 
-typedef struct EscapeEncodingData {
+typedef struct {
     int fallback;		/* Character (in this encoding) to substitute
 				 * when this encoding cannot represent a UTF-8
 				 * character. */
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 0b585b6..fb5e9c5 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -37,7 +37,7 @@ typedef struct BgError {
  * pending background errors for the interpreter.
  */
 
-typedef struct ErrAssocData {
+typedef struct {
     Tcl_Interp *interp;		/* Interpreter in which error occurred. */
     Tcl_Obj *cmdPrefix;		/* First word(s) of the handler command */
     BgError *firstBgPtr;	/* First in list of all background errors
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 3c0b472..8f66ef8 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -170,7 +170,7 @@ static BuiltinFunc const tclBuiltinFuncTable[] = {
  * Minimal data required to fully reconstruct the execution state.
  */
 
-typedef struct TEBCdata {
+typedef struct {
     ByteCode *codePtr;		/* Constant until the BC returns */
 				/* -----------------------------------------*/
     const unsigned char *pc;	/* These fields are used on return TO this */
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4e24533..aae66d4 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -24,7 +24,7 @@
  * The structure defined below is used in this file only.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     NextChannelHandler *nestedHandlerPtr;
 				/* This variable holds the list of nested
 				 * ChannelHandlerEventProc invocations. */
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 005713d..3d04f37 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -15,7 +15,7 @@
  * Callback structure for accept callback in a TCP server.
  */
 
-typedef struct AcceptCallback {
+typedef struct {
     char *script;		/* Script to invoke. */
     Tcl_Interp *interp;		/* Interpreter in which to run it. */
 } AcceptCallback;
@@ -25,7 +25,7 @@ typedef struct AcceptCallback {
  * It must be per-thread because of std channel limitations.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     int initialized;		/* Set to 1 when the module is initialized. */
     Tcl_Obj *stdoutObjPtr;	/* Cached stdout channel Tcl_Obj */
 } ThreadSpecificData;
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index cb0282a..4b61538 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -256,7 +256,7 @@ typedef enum {
  * sharing problems.
  */
 
-typedef struct ForwardParamBase {
+typedef struct {
     int code;			/* O: Ok/Fail of the cmd handler */
     char *msgStr;		/* O: Error message for handler failure */
     int mustFree;		/* O: True if msgStr is allocated, false if
@@ -331,7 +331,7 @@ typedef struct ForwardingResult ForwardingResult;
  * General event structure, with reference to operation specific data.
  */
 
-typedef struct ForwardingEvent {
+typedef struct {
     Tcl_Event event;		/* Basic event data, has to be first item */
     ForwardingResult *resultPtr;
     ForwardedOperation op;	/* Forwarded driver operation */
@@ -368,7 +368,7 @@ struct ForwardingResult {
 				 * results. */
 };
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * Table of all reflected channels owned by this thread. This is the
      * per-thread version of the per-interpreter map.
@@ -774,7 +774,7 @@ TclChanCreateObjCmd(
  *----------------------------------------------------------------------
  */
 
-typedef struct ReflectEvent {
+typedef struct {
     Tcl_Event header;
     ReflectedChannel *rcPtr;
     int events;
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index 2b9efb9..99ee2ec 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -87,7 +87,7 @@ static const Tcl_ChannelType tclRTransformType = {
  * layers upon reading from the channel, plus the functions to manage such.
  */
 
-typedef struct _ResultBuffer_ {
+typedef struct {
     unsigned char *buf;		/* Reference to the buffer area. */
     int allocated;		/* Allocated size of the buffer area. */
     int used;			/* Number of bytes in the buffer,
@@ -252,7 +252,7 @@ typedef enum {
  * sharing problems.
  */
 
-typedef struct ForwardParamBase {
+typedef struct {
     int code;			/* O: Ok/Fail of the cmd handler */
     char *msgStr;		/* O: Error message for handler failure */
     int mustFree;		/* O: True if msgStr is allocated, false if
@@ -297,7 +297,7 @@ typedef struct ForwardingResult ForwardingResult;
  * General event structure, with reference to operation specific data.
  */
 
-typedef struct ForwardingEvent {
+typedef struct {
     Tcl_Event event;		/* Basic event data, has to be first item */
     ForwardingResult *resultPtr;
     ForwardedOperation op;	/* Forwarded driver operation */
@@ -328,7 +328,7 @@ struct ForwardingResult {
 				 * results. */
 };
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * Table of all reflected transformations owned by this thread.
      */
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 2d6d898..c0fef56 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -54,7 +54,7 @@ typedef struct FilesystemRecord {
  * this information each time the corresponding epoch counter changes.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     int initialized;
     int cwdPathEpoch;
     int filesystemEpoch;
@@ -243,7 +243,7 @@ static Tcl_ThreadDataKey fsDataKey;
  * code.
  */
 
-typedef struct FsDivertLoad {
+typedef struct {
     Tcl_LoadHandle loadHandle;
     Tcl_FSUnloadFileProc *unloadProcPtr;
     Tcl_Obj *divertedFile;
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 0b0f652..b817b52 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -25,14 +25,14 @@ static const char *tclPreInitScript = NULL;
 struct Target;
 
 /*
- * struct Alias:
+ * Alias:
  *
  * Stores information about an alias. Is stored in the slave interpreter and
  * used by the source command to find the target command in the master when
  * the source command is invoked.
  */
 
-typedef struct Alias {
+typedef struct {
     Tcl_Obj *token;		/* Token for the alias command in the slave
 				 * interp. This used to be the command name in
 				 * the slave when the alias was first
@@ -73,7 +73,7 @@ typedef struct Alias {
  * slave interpreter, e.g. what aliases are defined in it.
  */
 
-typedef struct Slave {
+typedef struct {
     Tcl_Interp *masterInterp;	/* Master interpreter for this slave. */
     Tcl_HashEntry *slaveEntryPtr;
 				/* Hash entry in masters slave table for this
@@ -84,7 +84,7 @@ typedef struct Slave {
     Tcl_Interp	*slaveInterp;	/* The slave interpreter. */
     Tcl_Command interpCmd;	/* Interpreter object command. */
     Tcl_HashTable aliasTable;	/* Table which maps from names of commands in
-				 * slave interpreter to struct Alias defined
+				 * slave interpreter to Alias defined
 				 * below. */
 } Slave;
 
@@ -127,7 +127,7 @@ typedef struct Target {
  * only load safe extensions.
  */
 
-typedef struct Master {
+typedef struct {
     Tcl_HashTable slaveTable;	/* Hash table for slave interpreters. Maps
 				 * from command names to Slave records. */
     Target *targetsPtr;		/* The head of a doubly-linked list of all the
@@ -144,7 +144,7 @@ typedef struct Master {
  * on a per-interp basis.
  */
 
-typedef struct InterpInfo {
+typedef struct {
     Master master;		/* Keeps track of all interps for which this
 				 * interp is the Master. */
     Slave slave;		/* Information necessary for this interp to
@@ -158,7 +158,7 @@ typedef struct InterpInfo {
  * likely to work properly on 64-bit architectures.
  */
 
-typedef struct ScriptLimitCallback {
+typedef struct {
     Tcl_Interp *interp;		/* The interpreter in which to execute the
 				 * callback. */
     Tcl_Obj *scriptObj;		/* The script to execute to perform the
@@ -171,7 +171,7 @@ typedef struct ScriptLimitCallback {
 				 * table. */
 } ScriptLimitCallback;
 
-typedef struct ScriptLimitCallbackKey {
+typedef struct {
     Tcl_Interp *interp;		/* The interpreter that the limit callback was
 				 * attached to. This is not the interpreter
 				 * that the callback runs in! */
diff --git a/generic/tclLink.c b/generic/tclLink.c
index a3b42bd..b5e540b 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -21,7 +21,7 @@
  * variable.
  */
 
-typedef struct Link {
+typedef struct {
     Tcl_Interp *interp;		/* Interpreter containing Tcl variable. */
     Tcl_Obj *varName;		/* Name of variable (must be global). This is
 				 * needed during trace callbacks, since the
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 14139ec..a2db09d 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -109,7 +109,7 @@ typedef enum {
     PROMPT_CONTINUE		/* Print prompt for command continuation */
 } PromptType;
 
-typedef struct InteractiveState {
+typedef struct {
     Tcl_Channel input;		/* The standard input channel from which lines
 				 * are read. */
     int tty;			/* Non-zero means standard input is a
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 3c93400..16d053e 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -31,7 +31,7 @@
  * limited to a single interpreter.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     long numNsCreated;		/* Count of the number of namespaces created
 				 * within the thread. This value is used as a
 				 * unique id for each namespace. Cannot be
@@ -52,7 +52,7 @@ static Tcl_ThreadDataKey dataKey;
  * with some information that is used to check the cached pointer's validity.
  */
 
-typedef struct ResolvedNsName {
+typedef struct {
     Namespace *nsPtr;		/* A cached pointer to the Namespace that the
 				 * name resolved to. */
     Namespace *refNsPtr;	/* Points to the namespace context in which
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 74cb29e..03141e4 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -58,7 +58,7 @@ char *tclEmptyStringRep = &tclEmptyString;
  * for sanity checking purposes.
  */
 
-typedef struct ObjData {
+typedef struct {
     Tcl_Obj *objPtr;		/* The pointer to the allocated Tcl_Obj. */
     const char *file;		/* The name of the source file calling this
 				 * function; used for debugging. */
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index db07c0e..14c61a9 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -71,7 +71,7 @@ static const Tcl_ObjType tclFsPathType = {
  *
  */
 
-typedef struct FsPath {
+typedef struct {
     Tcl_Obj *translatedPathPtr; /* Name without any ~user sequences. If this
 				 * is NULL, then this is a pure normalized,
 				 * absolute path object, in which the parent
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 9b6e942..2860949 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -39,7 +39,7 @@ typedef struct PkgAvail {
  * "Tk" (no version number).
  */
 
-typedef struct Package {
+typedef struct {
     char *version;		/* Version that has been supplied in this
 				 * interpreter via "package provide"
 				 * (malloc'ed). NULL means the package doesn't
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
index 0bd8f93..62c8de4 100644
--- a/generic/tclPreserve.c
+++ b/generic/tclPreserve.c
@@ -53,7 +53,7 @@ TCL_DECLARE_MUTEX(preserveMutex)/* To protect the above statics */
  * objects that we don't want to live any longer than necessary.
  */
 
-typedef struct HandleStruct {
+typedef struct {
     void *ptr;			/* Pointer to the memory block being tracked.
 				 * This field will become NULL when the memory
 				 * block is deleted. This field must be the
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 6c1dc08..4977934 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -64,7 +64,7 @@
 
 #define NUM_REGEXPS 30
 
-typedef struct ThreadSpecificData {
+typedef struct {
     int initialized;		/* Set to 1 when the module is initialized. */
     char *patterns[NUM_REGEXPS];/* Strings corresponding to compiled regular
 				 * expression patterns. NULL means that this
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 9707f20..a441d3d 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -35,7 +35,7 @@ static void		SetupAppendBuffer(Interp *iPtr, int newSpace);
  * then back up to the result or the error that was previously in progress.
  */
 
-typedef struct InterpState {
+typedef struct {
     int status;			/* return code status */
     int flags;			/* Each remaining field saves the */
     int returnLevel;		/* corresponding field of the Interp */
diff --git a/generic/tclScan.c b/generic/tclScan.c
index ef7eedf..c54395d 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -28,7 +28,7 @@
  * character set.
  */
 
-typedef struct CharSet {
+typedef struct {
     int exclude;		/* 1 if this is an exclusion set. */
     int nchars;
     Tcl_UniChar *chars;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 04cf4ee..64c661b 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -104,7 +104,7 @@ const Tcl_ObjType tclStringType = {
  * tcl.h, but do not do that unless you are sure what you're doing!
  */
 
-typedef struct String {
+typedef struct {
     int numChars;		/* The number of chars in the string. -1 means
 				 * this value has not been calculated. >= 0
 				 * means that there is a valid Unicode rep, or
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5dc95f9..050f065 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -98,7 +98,7 @@ static Tcl_Trace cmdTrace;
  * TestdelCmd:
  */
 
-typedef struct DelCmd {
+typedef struct {
     Tcl_Interp *interp;		/* Interpreter in which command exists. */
     char *deleteCmd;		/* Script to execute when command is deleted.
 				 * Malloc'ed. */
@@ -109,7 +109,7 @@ typedef struct DelCmd {
  * command.
  */
 
-typedef struct TclEncoding {
+typedef struct {
     Tcl_Interp *interp;
     char *toUtfCmd;
     char *fromUtfCmd;
@@ -132,7 +132,7 @@ static int exitMainLoop = 0;
  * Event structure used in testing the event queue management procedures.
  */
 
-typedef struct TestEvent {
+typedef struct {
     Tcl_Event header;		/* Header common to all events */
     Tcl_Interp *interp;		/* Interpreter that will handle the event */
     Tcl_Obj *command;		/* Command to evaluate when the event occurs */
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 7494beb..c86eb9f 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -47,7 +47,7 @@ static int		TestobjCmd(ClientData dummy, Tcl_Interp *interp,
 static int		TeststringobjCmd(ClientData dummy, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 
-typedef struct TestString {
+typedef struct {
     int numChars;
     int allocated;
     int maxChars;
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index a3f89f6..3324b98 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -34,7 +34,7 @@ static const char procCommand[] = "proc";
  * procs
  */
 
-typedef struct CmdTable {
+typedef struct {
     const char *cmdName;		/* command name */
     Tcl_ObjCmdProc *proc;	/* command proc */
     int exportIt;		/* if 1, export the command */
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index e4261d6..e57988b 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -82,7 +82,7 @@ typedef union Block {
  * and statistics information.
  */
 
-typedef struct Bucket {
+typedef struct {
     Block *firstPtr;		/* First block available */
     long numFree;		/* Number of blocks available */
 
diff --git a/generic/tclThreadStorage.c b/generic/tclThreadStorage.c
index f24e334..36bf0a5 100644
--- a/generic/tclThreadStorage.c
+++ b/generic/tclThreadStorage.c
@@ -47,7 +47,7 @@ static struct TSDMaster {
  * The type of the data held per thread in a system TSD.
  */
 
-typedef struct TSDTable {
+typedef struct {
     ClientData *tablePtr;	/* The table of Tcl TSDs. */
     sig_atomic_t allocated;	/* The size of the table in the current
 				 * thread. */
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 22b5995..aa9aaef 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -61,7 +61,7 @@ static ThreadSpecificData *threadList = NULL;
  * "thread create" Tcl command or the ThreadCreate() C function.
  */
 
-typedef struct ThreadCtrl {
+typedef struct {
     const char *script;		/* The Tcl command this thread should
 				 * execute */
     int flags;			/* Initial value of the "flags" field in the
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 6b17825..735c54a 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -91,7 +91,7 @@ typedef struct IdleHandler {
  * The structure defined below is used in this file only.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     TimerHandler *firstTimerHandlerPtr;	/* First event in queue. */
     int lastTimerId;		/* Timer identifier of most recently created
 				 * timer. */
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 519f201..2dfd893 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -143,7 +143,7 @@ static int		TraceVarEx(Tcl_Interp *interp, const char *part1,
  * trace procs
  */
 
-typedef struct StringTraceData {
+typedef struct {
     ClientData clientData;	/* Client data from Tcl_CreateTrace */
     Tcl_CmdTraceProc *proc;	/* Trace function from Tcl_CreateTrace */
 } StringTraceData;
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 9ee37f1..023e082 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -99,7 +99,7 @@
  * This structure describes per-instance state of a file based channel.
  */
 
-typedef struct FileState {
+typedef struct {
     Tcl_Channel channel;	/* Channel associated with this file. */
     int fd;			/* File handle. */
     int validMask;		/* OR'ed combination of TCL_READABLE,
@@ -126,7 +126,7 @@ typedef struct TtyState {
  * a platform-independant manner.
  */
 
-typedef struct TtyAttrs {
+typedef struct {
     int baud;
     int parity;
     int data;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index e201018..5cb35d2 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -49,7 +49,7 @@
 
 #ifdef TCL_THREADS
 
-typedef struct ThreadSpecificData {
+typedef struct {
     struct passwd pwd;
 #if defined(HAVE_GETPWNAM_R_5) || defined(HAVE_GETPWUID_R_5)
 #define NEED_PW_CLEANER 1
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index f07b123..39be160 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -42,12 +42,12 @@ static const char *const platforms[NUMPLATFORMS] = {
 };
 
 #define NUMPROCESSORS 11
-static const char *const  processors[NUMPROCESSORS] = {
+static const char *const processors[NUMPROCESSORS] = {
     "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
     "amd64", "ia32_on_win64"
 };
 
-typedef struct _SYSTEM_INFO {
+typedef struct {
   union {
     DWORD  dwOemId;
     struct {
@@ -66,7 +66,7 @@ typedef struct _SYSTEM_INFO {
   int      wProcessorRevision;
 } SYSTEM_INFO;
 
-typedef struct _OSVERSIONINFOA {
+typedef struct {
   DWORD dwOSVersionInfoSize;
   DWORD dwMajorVersion;
   DWORD dwMinorVersion;
@@ -112,7 +112,7 @@ static char pkgPath[sizeof(TCL_PACKAGE_PATH)+200] = TCL_PACKAGE_PATH;
  * first list checked for a mapping from env encoding to Tcl encoding name.
  */
 
-typedef struct LocaleTable {
+typedef struct {
     const char *lang;
     const char *encoding;
 } LocaleTable;
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index b87af1b..5c03b79 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -39,7 +39,7 @@ typedef struct FileHandler {
  * handlers are ready to fire.
  */
 
-typedef struct FileHandlerEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     int fd;			/* File descriptor that is ready. Used to find
@@ -54,7 +54,7 @@ typedef struct FileHandlerEvent {
  * writable, and exception conditions.
  */
 
-typedef struct SelectMasks {
+typedef struct {
     fd_set readable;
     fd_set writable;
     fd_set exception;
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 654c9d8..e2a534e 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -30,7 +30,7 @@
  * This structure describes per-instance state of a pipe based channel.
  */
 
-typedef struct PipeState {
+typedef struct {
     Tcl_Channel channel;	/* Channel associated with this file. */
     TclFile inFile;		/* Output from pipe. */
     TclFile outFile;		/* Input to pipe. */
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index 46fc972..8b3338a 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -37,7 +37,7 @@
  * exercised by the "testfilehandler" command.
  */
 
-typedef struct Pipe {
+typedef struct {
     TclFile readFile;		/* File handle for reading from the pipe. NULL
 				 * means pipe doesn't exist yet. */
     TclFile writeFile;		/* File handle for writing from the pipe. */
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 789dbb6..9a1efbe 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -15,7 +15,7 @@
 
 #ifdef TCL_THREADS
 
-typedef struct ThreadSpecificData {
+typedef struct {
     char nabuf[16];
 } ThreadSpecificData;
 
@@ -683,7 +683,7 @@ TclpInetNtoa(
 static volatile int initialized = 0;
 static pthread_key_t key;
 
-typedef struct allocMutex {
+typedef struct {
     Tcl_Mutex tlock;
     pthread_mutex_t plock;
 } allocMutex;
@@ -691,10 +691,10 @@ typedef struct allocMutex {
 Tcl_Mutex *
 TclpNewAllocMutex(void)
 {
-    struct allocMutex *lockPtr;
+    allocMutex *lockPtr;
     register pthread_mutex_t *plockPtr;
 
-    lockPtr = malloc(sizeof(struct allocMutex));
+    lockPtr = malloc(sizeof(allocMutex));
     if (lockPtr == NULL) {
 	Tcl_Panic("could not allocate lock");
     }
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index c7921fe..9497502 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -26,7 +26,7 @@
  */
 
 static Tcl_ThreadDataKey tmKey;
-typedef struct ThreadSpecificData {
+typedef struct {
     struct tm gmtime_buf;
     struct tm localtime_buf;
 } ThreadSpecificData;
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 52b9e32..e8f46ef 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -43,7 +43,7 @@ typedef struct FileInfo {
 				 * pending on the channel. */
 } FileInfo;
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * List of all file channels currently open.
      */
@@ -58,7 +58,7 @@ static Tcl_ThreadDataKey dataKey;
  * events are generated.
  */
 
-typedef struct FileEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     FileInfo *infoPtr;		/* Pointer to file info structure. Note that
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 5aab255..094a5e9 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -50,7 +50,7 @@ TCL_DECLARE_MUTEX(consoleMutex)
  * threads.
  */
 
-typedef struct ConsoleThreadInfo {
+typedef struct {
     HANDLE thread;		/* Handle to reader or writer thread. */
     HANDLE readyEvent;		/* Manual-reset event to signal _to_ the main
 				 * thread when the worker thread has finished
@@ -113,7 +113,7 @@ typedef struct ConsoleInfo {
 				/* Data consumed by reader thread. */
 } ConsoleInfo;
 
-typedef struct ThreadSpecificData {
+typedef struct{
     /*
      * The following pointer refers to the head of the list of consoles that
      * are being watched for file events.
@@ -129,7 +129,7 @@ static Tcl_ThreadDataKey dataKey;
  * console events are generated.
  */
 
-typedef struct ConsoleEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     ConsoleInfo *infoPtr;	/* Pointer to console info structure. Note
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 23b3a8e..bf8cc86 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -68,7 +68,7 @@ typedef struct Conversation {
     Tcl_Obj *returnPackagePtr;	/* The result package for this conversation. */
 } Conversation;
 
-typedef struct DdeEnumServices {
+typedef struct {
     Tcl_Interp *interp;
     int result;
     ATOM service;
@@ -76,7 +76,7 @@ typedef struct DdeEnumServices {
     HWND hwnd;
 } DdeEnumServices;
 
-typedef struct ThreadSpecificData {
+typedef struct {
     Conversation *currentConversations;
 				/* A list of conversations currently being
 				 * processed. */
@@ -113,7 +113,7 @@ TCL_DECLARE_MUTEX(ddeMutex)
 
 static LRESULT CALLBACK	DdeClientWindowProc(HWND hwnd, UINT uMsg,
 			    WPARAM wParam, LPARAM lParam);
-static int		DdeCreateClient(struct DdeEnumServices *es);
+static int		DdeCreateClient(DdeEnumServices *es);
 static BOOL CALLBACK	DdeEnumWindowsCallback(HWND hwndTarget,
 			    LPARAM lParam);
 static void		DdeExitProc(ClientData clientData);
@@ -1038,7 +1038,7 @@ MakeDdeConnection(
 
 static int
 DdeCreateClient(
-    struct DdeEnumServices *es)
+    DdeEnumServices *es)
 {
     WNDCLASSEX wc;
     static const TCHAR *szDdeClientClassName = TEXT("TclEval client class");
@@ -1048,7 +1048,7 @@ DdeCreateClient(
     wc.cbSize = sizeof(wc);
     wc.lpfnWndProc = DdeClientWindowProc;
     wc.lpszClassName = szDdeClientClassName;
-    wc.cbWndExtra = sizeof(struct DdeEnumServices *);
+    wc.cbWndExtra = sizeof(DdeEnumServices *);
 
     /*
      * Register and create the callback window.
@@ -1070,8 +1070,8 @@ DdeClientWindowProc(
     switch (uMsg) {
     case WM_CREATE: {
 	LPCREATESTRUCT lpcs = (LPCREATESTRUCT) lParam;
-	struct DdeEnumServices *es =
-		(struct DdeEnumServices *) lpcs->lpCreateParams;
+	DdeEnumServices *es =
+		(DdeEnumServices *) lpcs->lpCreateParams;
 
 #ifdef _WIN64
 	SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) es);
@@ -1096,14 +1096,14 @@ DdeServicesOnAck(
     HWND hwndRemote = (HWND)wParam;
     ATOM service = (ATOM)LOWORD(lParam);
     ATOM topic = (ATOM)HIWORD(lParam);
-    struct DdeEnumServices *es;
+    DdeEnumServices *es;
     TCHAR sz[255];
     Tcl_DString dString;
 
 #ifdef _WIN64
-    es = (struct DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    es = (DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
 #else
-    es = (struct DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
+    es = (DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
 #endif
 
     if ((es->service == (ATOM)0 || es->service == service)
@@ -1154,7 +1154,7 @@ DdeEnumWindowsCallback(
     LPARAM lParam)
 {
     DWORD_PTR dwResult = 0;
-    struct DdeEnumServices *es = (struct DdeEnumServices *) lParam;
+    DdeEnumServices *es = (DdeEnumServices *) lParam;
 
     SendMessageTimeout(hwndTarget, WM_DDE_INITIATE, (WPARAM)es->hwnd,
 	    MAKELONG(es->service, es->topic), SMTO_ABORTIFHUNG, 1000,
@@ -1168,7 +1168,7 @@ DdeGetServicesList(
     const TCHAR *serviceName,
     const TCHAR *topicName)
 {
-    struct DdeEnumServices es;
+    DdeEnumServices es;
 
     es.interp = interp;
     es.result = TCL_OK;
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index 4543b02..aaa5878 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -27,7 +27,7 @@
  * created for each thread that is using the notifier.
  */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     CRITICAL_SECTION crit;	/* Monitor for this notifier. */
     DWORD thread;		/* Identifier for thread associated with this
 				 * notifier. */
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 36ae58a..3309858 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -52,7 +52,7 @@ TCL_DECLARE_MUTEX(pipeMutex)
  * used in a pipeline.
  */
 
-typedef struct WinFile {
+typedef struct {
     int type;			/* One of the file types defined above. */
     HANDLE handle;		/* Open file handle. */
 } WinFile;
@@ -144,7 +144,7 @@ typedef struct PipeInfo {
 				 * synchronized with the readable object. */
 } PipeInfo;
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * The following pointer refers to the head of the list of pipes that are
      * being watched for file events.
@@ -160,7 +160,7 @@ static Tcl_ThreadDataKey dataKey;
  * events are generated.
  */
 
-typedef struct PipeEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     PipeInfo *infoPtr;		/* Pointer to pipe info structure. Note that
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 9e9d1af..4c9a495 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -122,7 +122,7 @@ typedef struct SerialInfo {
 				 * [fconfigure -queue] */
 } SerialInfo;
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * The following pointer refers to the head of the list of serials that
      * are being watched for file events.
@@ -138,7 +138,7 @@ static Tcl_ThreadDataKey dataKey;
  * events are generated.
  */
 
-typedef struct SerialEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     SerialInfo *infoPtr;	/* Pointer to serial info structure. Note that
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 9f7caee..62b2f7f 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -163,7 +163,7 @@ struct SocketInfo {
  * socket event occurs.
  */
 
-typedef struct SocketEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     SOCKET socket;		/* Socket descriptor that is ready. Used to
@@ -191,7 +191,7 @@ typedef struct SocketEvent {
 #define SOCKET_PENDING		(1<<3)	/* A message has been sent for this
 					 * socket */
 
-typedef struct ThreadSpecificData {
+typedef struct {
     HWND hwnd;			/* Handle to window for socket messages. */
     HANDLE socketThread;	/* Thread handling the window */
     Tcl_ThreadId threadId;	/* Parent thread. */
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 102fd40..5d4a754 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -102,7 +102,7 @@ static Tcl_ThreadDataKey dataKey;
  * the queue.
  */
 
-typedef struct WinCondition {
+typedef struct {
     CRITICAL_SECTION condLock;	/* Lock to serialize queuing on the
 				 * condition. */
     struct ThreadSpecificData *firstPtr;	/* Queue pointers */
@@ -117,7 +117,7 @@ typedef struct WinCondition {
 static int once;
 static DWORD tlsKey;
 
-typedef struct allocMutex {
+typedef struct {
     Tcl_Mutex	     tlock;
     CRITICAL_SECTION wlock;
 } allocMutex;
@@ -873,9 +873,9 @@ TclpFinalizeCondition(
 Tcl_Mutex *
 TclpNewAllocMutex(void)
 {
-    struct allocMutex *lockPtr;
+    allocMutex *lockPtr;
 
-    lockPtr = malloc(sizeof(struct allocMutex));
+    lockPtr = malloc(sizeof(allocMutex));
     if (lockPtr == NULL) {
 	Tcl_Panic("could not allocate lock");
     }
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index daa229d..80e51b6 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -35,7 +35,7 @@ static const int leapDays[] = {
     -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
 };
 
-typedef struct ThreadSpecificData {
+typedef struct {
     char tzName[64];		/* Time zone name */
     struct tm tm;		/* time information */
 } ThreadSpecificData;
@@ -45,7 +45,7 @@ static Tcl_ThreadDataKey dataKey;
  * Data for managing high-resolution timers.
  */
 
-typedef struct TimeInfo {
+typedef struct {
     CRITICAL_SECTION cs;	/* Mutex guarding this structure. */
     int initialized;		/* Flag == 1 if this structure is
 				 * initialized. */
-- 
cgit v0.12


From 7635c56e5d97f850720e137724350c619d398810 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 8 Nov 2012 15:25:30 +0000
Subject: Create Tcl 8.6.0 release branch

---
 README            | 2 +-
 generic/tcl.h     | 6 +++---
 library/init.tcl  | 2 +-
 unix/configure    | 2 +-
 unix/configure.in | 2 +-
 unix/tcl.spec     | 2 +-
 win/configure     | 2 +-
 win/configure.in  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 56f7e38..f8965b4 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.6b3 source distribution.
+    This is the Tcl 8.6.0 source distribution.
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
diff --git a/generic/tcl.h b/generic/tcl.h
index 5f6146e..d765967 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -55,11 +55,11 @@ extern "C" {
 
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   6
-#define TCL_RELEASE_LEVEL   TCL_BETA_RELEASE
-#define TCL_RELEASE_SERIAL  3
+#define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
+#define TCL_RELEASE_SERIAL  0
 
 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6b3"
+#define TCL_PATCH_LEVEL	    "8.6.0"
 
 /*
  *----------------------------------------------------------------------------
diff --git a/library/init.tcl b/library/init.tcl
index 3ec78af..e836df9 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -15,7 +15,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6b3
+package require -exact Tcl 8.6.0
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/unix/configure b/unix/configure
index cbb10b4..f778a7b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index f4b695d..087bb05 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 0c42aa4..27f7189 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.6b3
+Version:       8.6.0
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index 0258898..03a20b4 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
diff --git a/win/configure.in b/win/configure.in
index 0426bb1..b0c007a 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
-- 
cgit v0.12


From ea58b7b66f821c689964f63701927b32b4de3369 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 8 Nov 2012 15:43:45 +0000
Subject: Declare TclOO portion of the Tcl API to be stable -> TclOO 1.0

---
 generic/tclOO.h     | 2 +-
 tests/oo.test       | 2 +-
 tests/ooNext2.test  | 2 +-
 unix/tclooConfig.sh | 2 +-
 win/tclooConfig.sh  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tclOO.h b/generic/tclOO.h
index 280481c..cf253b1 100644
--- a/generic/tclOO.h
+++ b/generic/tclOO.h
@@ -39,7 +39,7 @@ extern const char *TclOOInitializeStubs(
  * win/tclooConfig.sh
  */
 
-#define TCLOO_VERSION "0.7"
+#define TCLOO_VERSION "1.0"
 #define TCLOO_PATCHLEVEL TCLOO_VERSION
 
 /*
diff --git a/tests/oo.test b/tests/oo.test
index 540cdf3..5d34077 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require -exact TclOO 0.7 ;# Must match value in generic/tclOO.h
+package require TclOO 1.0
 package require tcltest 2
 if {"::tcltest" in [namespace children]} {
     namespace import -force ::tcltest::*
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index e78e0d0..d77e8d1 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require -exact TclOO 0.7 ;# Must match value in configure.in
+package require TclOO 1.0
 package require tcltest 2
 if {"::tcltest" in [namespace children]} {
     namespace import -force ::tcltest::*
diff --git a/unix/tclooConfig.sh b/unix/tclooConfig.sh
index dce540a..d2be8dd 100644
--- a/unix/tclooConfig.sh
+++ b/unix/tclooConfig.sh
@@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC=""
 TCLOO_INCLUDE_SPEC=""
 TCLOO_PRIVATE_INCLUDE_SPEC=""
 TCLOO_CFLAGS=-DUSE_TCLOO_STUBS
-TCLOO_VERSION=0.7
+TCLOO_VERSION=1.0
diff --git a/win/tclooConfig.sh b/win/tclooConfig.sh
index dce540a..d2be8dd 100644
--- a/win/tclooConfig.sh
+++ b/win/tclooConfig.sh
@@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC=""
 TCLOO_INCLUDE_SPEC=""
 TCLOO_PRIVATE_INCLUDE_SPEC=""
 TCLOO_CFLAGS=-DUSE_TCLOO_STUBS
-TCLOO_VERSION=0.7
+TCLOO_VERSION=1.0
-- 
cgit v0.12


From c1784e6b4c9a0008544f33c672e1af223e09ae29 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 10 Dec 2012 23:23:50 +0000
Subject: Improve the generation of HTML documentation in 8.6, allowing for
 contributed packages whose non-version name parts are prefixes of others.
 Also ensure that documentation builds are complete after distribution, and
 that we generate a better error message when using the wrong tclsh version to
 do the build.

---
 ChangeLog                | 29 ++++++++++++++++++++---------
 tools/tcltk-man2html.tcl | 22 +++++++++++++++-------
 unix/Makefile.in         |  3 ++-
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c42929..9beccc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,23 @@
+2012-12-10  Donal K. Fellows  <dkf@users.sf.net>
+
+	* tools/tcltk-man2html.tcl (plus-pkgs): Increased robustness of
+	version number detection code to deal with packages whose names are
+	prefixes of other packages.
+	* unix/Makefile.in (dist): Added pkgs/package.list.txt to distribution
+	builds to ensure that 'make html' will work better.
+
 2012-12-09  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-	* tests/chan.test: Clean up unwanted eofchar side-effect of
-	chan-4.6 leading to a spurious "'" at end of chan.test under
-	certain conditions (see [Bug 3389289] and [Bug 3389251]).
-	* doc/expr.n: [Bug 3594188] Clarifications about commas.
+
+	* tests/chan.test: Clean up unwanted eofchar side-effect of chan-4.6
+	leading to a spurious "'" at end of chan.test under certain conditions
+	(see [Bug 3389289] and [Bug 3389251]).
+
+	* doc/expr.n: [Bug 3594188]: Clarifications about commas.
 
 2012-12-08  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
+
 	* generic/tclIO.c: Fix busyloop at exit under TCL_FINALIZE_ON_EXIT
-	when there  are unflushed nonblocking channels.  Thanks Miguel for
+	when there are unflushed nonblocking channels.  Thanks Miguel for
 	spotting.
 
 2012-12-07  Jan Nijtmans  <nijtmans@users.sf.net>
@@ -24,10 +35,10 @@
 2012-11-26  Reinhard Max  <max@suse.de>
 
 	* unix/tclUnixSock.c: Factor out creation of the -sockname and
-	-peername lists from TcpGetOptionProc() to TcpHostPortList().
-	Make it robust against implementations of getnameinfo() that error
-	out if reverse mapping fails instead of falling back to the
-	numeric representation.
+	-peername lists from TcpGetOptionProc() to TcpHostPortList().  Make it
+	robust against implementations of getnameinfo() that error out if
+	reverse mapping fails instead of falling back to the numeric
+	representation.
 
 2012-11-20  Donal K. Fellows  <dkf@users.sf.net>
 
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 665a1d4..270a774 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -1,6 +1,12 @@
 #!/usr/bin/env tclsh
 
-package require Tcl 8.6
+if {[catch {package require Tcl 8.6} msg]} {
+    puts stderr "ERROR: $msg"
+    puts stderr "If running this script from 'make html', set the\
+	NATIVE_TCLSH environment\nvariable to point to an installed\
+	tclsh8.6 (or the equivalent tclsh86.exe\non Windows)."
+    exit 1
+}
 
 # Convert Ousterhout format man pages into highly crosslinked hypertext.
 #
@@ -16,7 +22,7 @@ package require Tcl 8.6
 # Copyright (c) 1995-1997 Roger E. Critchlow Jr
 # Copyright (c) 2004-2010 Donal K. Fellows
 
-regexp {\d+\.\d+} {$Revision: 1.49 $} ::Version
+set ::Version "50/8.6"
 set ::CSSFILE "docs.css"
 
 ##
@@ -454,16 +460,18 @@ proc plus-pkgs {type args} {
     }
     if {!$build_tcl} return
     set result {}
+    set pkgsdir $tcltkdir/$tcldir/pkgs
     foreach {dir name} $args {
-	set globpat $tcltkdir/$tcldir/pkgs/$dir*/doc/*.$type
-	if {![llength [glob -nocomplain $globpat]]} {
+	set globpat $pkgsdir/{$dir,$dir\[0-9\]*}/doc/*.$type
+	if {![llength [glob -type f -nocomplain $globpat]]} {
 	    # Fallback for manpages generated using doctools
-	    set globpat $tcltkdir/$tcldir/pkgs/$dir*/doc/man/*.$type
-	    if {![llength [glob -nocomplain $globpat]]} {
+	    set globpat $pkgsdir/{$dir,$dir\[0-9\]*}/doc/man/*.$type
+	    if {![llength [glob -type f -nocomplain $globpat]]} {
 		continue
 	    }
 	}
-	regexp "pkgs/${dir}(.*)/doc$" [glob $tcltkdir/$tcldir/pkgs/$dir*/doc] \
+	regexp "pkgs/${dir}(.*)/doc$" \
+	    [lindex [glob -type d $pkgsdir/{$dir,$dir\[0-9\]*}/doc] 0] \
 	    -> version
 	switch $type {
 	    n {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index df05759..680d4ce 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2019,7 +2019,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \
 		$(DISTDIR)/libtommath
 	mkdir $(DISTDIR)/pkgs
-	cp $(TOP_DIR)/pkgs/README $(DISTDIR)/pkgs
+	cp $(TOP_DIR)/pkgs/README $(TOP_DIR)/pkgs/package.list.txt \
+		$(DISTDIR)/pkgs
 	for i in `ls $(DISTROOT)/pkgs/*.tar.gz 2> /dev/null`; do \
 	    tar -C $(DISTDIR)/pkgs -xzf "$$i"; \
 	done
-- 
cgit v0.12


From c13ee047c8e204b46ca84bf7c9737f464470782f Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 11 Dec 2012 21:19:11 +0000
Subject: update changes

---
 changes | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/changes b/changes
index 0ced7a1..b517cec 100644
--- a/changes
+++ b/changes
@@ -8117,11 +8117,45 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 --- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
 
+2012-09-20 (enhancement) full Unicode support (nijtmans)
+=> dde 1.4.0
+
+2012-09-20 (enhancement) update bundled zlib to 1.2.7 (nijtmans)
+
 2012-10-03 (bug fix) exit panic on stacked std channel (griffin,porter)
 
 2012-10-14 (bug fix) [tcl::Bgerror] crash on non-dict options (nijtmans)
 
+2012-10-16 (TIP 400) New [zlib] options to set compression dict (fellows)
+
+2012-10-16 (TIP 405) New commands [lmap] and [dict map] (fellows)
+
+2012-10-24 (enhancement) [dict unset] now bytecompiled (fellows)
+
+2012-11-05 (TIP 413) Revisions to default [string trim*] trimset (nijtmans)
+	*** POTENTIAL INCOMPATIBILITY ***
+
+2012-11-05 (enhancement) Now bytecompiled: [array exists], [array set],
+[array unset], [dict create], [dict exists], [dict merge], [format],
+[info commands], [info coroutine], [info level], [info object],
+[namespace current], [namespace code], [namespace qualifiers], [namespace tail],
+[namespace which], [regsub], [self], [string first], [string last],
+[string map], [string range], [tailcall], [yield]. (fellows)
+
 2012-11-06 (bug fix)[3581754] avoid multiple callback on keep-alive (fellows)
 => http 2.8.5
 
---- Released 8.6.0, ??? ??, 2012 --- See ChangeLog for details ---
+2012-11-07 tzdata updated to Olson's tzdata2012i (kenny)
+
+2012-11-13 (bug fix)[3567063] thread fp settings from master (mistachkin)
+
+2012-11-14 (bug fix)[2933003] tempfile creation in $TMPDIR (fellows)
+
+2012-11-15 (TIP 416) New [load] options -global and -lazy (nijtmans)
+
+2012-11-20 (bug fix)[3033307] base64 trail whitespace (kovalenko,goth)
+
+2012-12-03 (bug fix) [configure] query broke init from argv (porter)
+=> tcltest 2.3.5
+
+--- Released 8.6.0, December 20, 2012 --- See ChangeLog for details ---
-- 
cgit v0.12


From 26f4ba76ca7de932401313aa8bb90cc386861083 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Dec 2012 10:21:55 +0000
Subject: allow novem to use installed Tcl8 .tm packages, such as tcltest and
 msgcat remove some dead code (already planned to be removed in Tcl9)

---
 generic/tcl.decls  |  3 ---
 generic/tclIOCmd.c | 14 --------------
 generic/tclMain.c  | 18 +-----------------
 library/tm.tcl     | 23 +++++++++++++++++++++++
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index ad725f5..198228b 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2374,9 +2374,6 @@ declare 1 macosx {
 # Public functions that are not accessible via the stubs table.
 
 export {
-    void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
-}
-export {
     const char *Tcl_InitStubs(Tcl_Interp *interp, const char *version,
 	int exact)
 }
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 2b3e805..f738b1a 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -416,25 +416,11 @@ Tcl_ReadObjCmd(
     if (i < objc) {
 	if ((TclGetIntFromObj(interp, objv[i], &toRead) != TCL_OK)
 		|| (toRead < 0)) {
-#if TCL_MAJOR_VERSION < 9
-	    /*
-	     * The code below provides backwards compatibility with an old
-	     * form of the command that is no longer recommended or
-	     * documented. See also [Bug #3151675]. Will be removed in Tcl 9,
-	     * maybe even earlier.
-	     */
-
-	    if (strcmp(TclGetString(objv[i]), "nonewline") != 0) {
-#endif
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"expected non-negative integer but got \"%s\"",
 			TclGetString(objv[i])));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
 		return TCL_ERROR;
-#if TCL_MAJOR_VERSION < 9
-	    }
-	    newline = 1;
-#endif
 	}
     }
 
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 73989ef..6c71fbb 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -284,7 +284,7 @@ Tcl_SourceRCFile(
 
 /*----------------------------------------------------------------------
  *
- * Tcl_Main, Tcl_MainEx --
+ * Tcl_MainEx --
  *
  *	Main program for tclsh and most other Tcl-based applications.
  *
@@ -632,22 +632,6 @@ Tcl_MainEx(
 
     Tcl_Exit(exitCode);
 }
-
-#if (TCL_MAJOR_VERSION == 8) && !defined(UNICODE)
-#undef Tcl_Main
-extern DLLEXPORT void
-Tcl_Main(
-    int argc,			/* Number of arguments. */
-    char **argv,		/* Array of argument strings. */
-    Tcl_AppInitProc *appInitProc)
-				/* Application-specific initialization
-				 * function to call after most initialization
-				 * but before starting to execute commands. */
-{
-    Tcl_FindExecutable(argv[0]);
-    Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp());
-}
-#endif /* TCL_MAJOR_VERSION == 8 && !UNICODE */
 
 #ifndef TCL_ASCII_MAIN
 
diff --git a/library/tm.tcl b/library/tm.tcl
index ce8a013..4288658 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -330,6 +330,19 @@ proc ::tcl::tm::Defaults {} {
 	    }
 	}
     }
+    if {$major == 8} return
+    for {set n 7} {$n >= 0} {incr n -1} {
+	foreach ev [::list \
+			TCL8.${n}_TM_PATH \
+			TCL8_${n}_TM_PATH \
+	    ] {
+	    if {![info exists env($ev)]} continue
+	    foreach p [split $env($ev) $sep] {
+		path add $p
+	    }
+	}
+    }
+    }
     return
 }
 
@@ -358,6 +371,16 @@ proc ::tcl::tm::roots {paths} {
 	set px [file join $p site-tcl]
 	if {![interp issafe]} {set px [file normalize $px]}
 	path add $px
+	if {$major == 8} continue
+	set p [file join $pa tcl8]
+	for {set n 7} {$n >= 0} {incr n -1} {
+	    set px [file join $p 8.${n}]
+	    if {![interp issafe]} {set px [file normalize $px]}
+	    path add $px
+	}
+	set px [file join $p site-tcl]
+	if {![interp issafe]} {set px [file normalize $px]}
+	path add $px
     }
     return
 }
-- 
cgit v0.12


From 6428006e92c49aaf5a4f3373c068655e73ac01be Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 12 Dec 2012 20:16:13 +0000
Subject: Prefer to extract package data from the *contents* not the directory
 name.

---
 pkgs/package.list.txt    |  2 +-
 tools/tcltk-man2html.tcl | 57 +++++++++++++++++++++++++++++++++++++++++-------
 unix/Makefile.in         |  3 +--
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/pkgs/package.list.txt b/pkgs/package.list.txt
index f12111d..a13b0fb 100644
--- a/pkgs/package.list.txt
+++ b/pkgs/package.list.txt
@@ -23,4 +23,4 @@ TDBC TDBC
 tdbcmysql	tdbc::mysql
 tdbcodbc	tdbc::odbc
 tdbcpostgres	tdbc::postgres
-tdbcsqlite3-	tdbc::sqlite3
+tdbcsqlite3	tdbc::sqlite3
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 270a774..f392bce 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -461,18 +461,15 @@ proc plus-pkgs {type args} {
     if {!$build_tcl} return
     set result {}
     set pkgsdir $tcltkdir/$tcldir/pkgs
-    foreach {dir name} $args {
-	set globpat $pkgsdir/{$dir,$dir\[0-9\]*}/doc/*.$type
+    foreach {dir name version} $args {
+	set globpat $pkgsdir/$dir/doc/*.$type
 	if {![llength [glob -type f -nocomplain $globpat]]} {
 	    # Fallback for manpages generated using doctools
-	    set globpat $pkgsdir/{$dir,$dir\[0-9\]*}/doc/man/*.$type
+	    set globpat $pkgsdir/$dir/doc/man/*.$type
 	    if {![llength [glob -type f -nocomplain $globpat]]} {
 		continue
 	    }
 	}
-	regexp "pkgs/${dir}(.*)/doc$" \
-	    [lindex [glob -type d $pkgsdir/{$dir,$dir\[0-9\]*}/doc] 0] \
-	    -> version
 	switch $type {
 	    n {
 		set title "$name Package Commands"
@@ -650,6 +647,42 @@ try {
 	append appdir "$tkdir"
     }
 
+
+    # When building docs for Tcl, try to build docs for bundled packages too
+    set packageBuildList {}
+    if  {$build_tcl} {
+	set pkgsDir [file join $tcltkdir $tcldir pkgs]
+	set subdirs [glob -nocomplain -types d -tails -directory $pkgsDir *]
+
+	foreach dir [lsort $subdirs] {
+	    # Parse the subdir name into (name, version) as fallback...
+	    set description [split $dir -]
+	    if {2 != [llength $description]} {
+		regexp {([^0-9]*)(.*)} $dir -> n v
+		set description [list $n $v]
+	    }
+
+	    # ... but try to extract (name, version) from subdir contents
+	    try {
+		set f [open [file join $pkgsDir $dir configure.in]]
+		foreach line [split [read $f] \n] {
+		    if {2 == [scan $line \
+			    { AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} {
+			set description [list $n $v]
+			break
+		    }
+		}
+	    } finally {
+		catch {close $f; unset f}
+	    }
+
+	    if {[file exists [file join $pkgsDir $dir configure]]} {
+		# Looks like a package, record our best extraction attempt
+		lappend packageBuildList $dir {*}$description
+	    }
+	}
+    }
+
     # Get the list of packages to try, and what their human-readable names
     # are. Note that the package directory list should be version-less.
     try {
@@ -674,6 +707,14 @@ try {
 	}
     }
 
+    # Convert to human readable names, if applicable
+    for {set idx 0} {$idx < [llength $packageBuildList]} {incr idx 3} {
+	lassign [lrange $packageBuildList $idx $idx+2] d n v
+	if {[dict exists $packageDirNameMap $n]} {
+	    lset packageBuildList $idx+1 [dict get $packageDirNameMap $n]
+	}
+    }
+
     #
     # Invoke the scraper/converter engine.
     #
@@ -684,12 +725,12 @@ try {
 	     "The commands which the <B>tclsh</B> interpreter implements."] \
 	[plus-base $build_tk $tkdir doc/*.n {Tk Commands} TkCmd \
 	     "The additional commands which the <B>wish</B> interpreter implements."] \
-	{*}[plus-pkgs n {*}$packageDirNameMap] \
+	{*}[plus-pkgs n {*}$packageBuildList] \
 	[plus-base $build_tcl $tcldir doc/*.3 {Tcl C API} TclLib \
 	     "The C functions which a Tcl extended C program may use."] \
 	[plus-base $build_tk $tkdir doc/*.3 {Tk C API} TkLib \
 	     "The additional C functions which a Tk extended C program may use."] \
-	{*}[plus-pkgs 3 {*}$packageDirNameMap]
+	{*}[plus-pkgs 3 {*}$packageBuildList]
 } on error {msg opts} {
     # On failure make sure we show what went wrong. We're not supposed
     # to get here though; it represents a bug in the script.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 680d4ce..df05759 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2019,8 +2019,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \
 		$(DISTDIR)/libtommath
 	mkdir $(DISTDIR)/pkgs
-	cp $(TOP_DIR)/pkgs/README $(TOP_DIR)/pkgs/package.list.txt \
-		$(DISTDIR)/pkgs
+	cp $(TOP_DIR)/pkgs/README $(DISTDIR)/pkgs
 	for i in `ls $(DISTROOT)/pkgs/*.tar.gz 2> /dev/null`; do \
 	    tar -C $(DISTDIR)/pkgs -xzf "$$i"; \
 	done
-- 
cgit v0.12


From 2f1b92ba12fe6dcbad5a26a6dc6f6be837155049 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Dec 2012 10:48:04 +0000
Subject: Fix Tcl_DecrRefCount macro, not to refer to its objPtr parameter
 twice.

---
 generic/tcl.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 36077e6..48fe062 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -810,9 +810,7 @@ typedef struct Tcl_Obj {
  * Note: clients should use Tcl_DecrRefCount() when they are finished using
  * an object, and should never call TclFreeObj() directly. TclFreeObj() is
  * only defined and made public in tcl.h to support Tcl_DecrRefCount's macro
- * definition. Note also that Tcl_DecrRefCount() refers to the parameter
- * "obj" twice. This means that you should avoid calling it with an
- * expression that is expensive to compute or has side effects.
+ * definition.
  */
 void		Tcl_IncrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
 void		Tcl_DecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
@@ -833,7 +831,12 @@ int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
      * http://c2.com/cgi/wiki?TrivialDoWhileLoop
      */
 #   define Tcl_DecrRefCount(objPtr) \
-	do { if (--(objPtr)->refCount <= 0) TclFreeObj(objPtr); } while(0)
+	do { \
+	    Tcl_Obj *obj = (objPtr); \
+	    if ((obj)->refCount-- < 2) { \
+		TclFreeObj(obj); \
+	    } \
+	} while(0)
 #   define Tcl_IsShared(objPtr) \
 	((objPtr)->refCount > 1)
 #endif
-- 
cgit v0.12


From b9a522a6bf466ea2e0be03923be7029824ffb17b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Dec 2012 12:03:51 +0000
Subject: Changelog entry, and change macro variable to not conflict with
 possible outside variable names

---
 ChangeLog     | 5 +++++
 generic/tcl.h | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef04907..092d5f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tcl.h: Fix Tcl_DecrRefCount macro such that it
+	doesn't access its objPtr parameter twice any more.
+
 2012-11-14  Donal K. Fellows  <dkf@users.sf.net>
 
 	* unix/tclUnixPipe.c (DefaultTempDir): [Bug 2933003]: Allow overriding
diff --git a/generic/tcl.h b/generic/tcl.h
index 48fe062..bf9b446 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -832,9 +832,9 @@ int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
      */
 #   define Tcl_DecrRefCount(objPtr) \
 	do { \
-	    Tcl_Obj *obj = (objPtr); \
-	    if ((obj)->refCount-- < 2) { \
-		TclFreeObj(obj); \
+	    Tcl_Obj *_objPtr = (objPtr); \
+	    if (_objPtr->refCount-- < 2) { \
+		TclFreeObj(_objPtr); \
 	    } \
 	} while(0)
 #   define Tcl_IsShared(objPtr) \
-- 
cgit v0.12


From 1d29f93257fce740da68d39ce7b96f1c28eccd59 Mon Sep 17 00:00:00 2001
From: mig <mig>
Date: Thu, 13 Dec 2012 13:37:19 +0000
Subject: Fix for [Bug 3595576], found by andrewsh

---
 ChangeLog          | 7 +++++++
 generic/tclCmdAH.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 87f0260..13fcaf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-13  Miguel Sofer  <msofer@users.sf.net>
+
+	* generic/tclCmdAH.c (CatchObjCmdCallback): do not decrRefCount
+	the newValuePtr sent to Tcl_ObjSetVar2: TOSV2 is 'fire and
+	forget', it decrs on its own. Fix for [Bug 3595576], found by
+	andrewsh.
+
 2012-12-13  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h: Fix Tcl_DecrRefCount macro such that it
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 14951e4..133a61b 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -361,7 +361,8 @@ CatchObjCmdCallback(
 
 	if (NULL == Tcl_ObjSetVar2(interp, optionVarNamePtr, NULL,
 		options, TCL_LEAVE_ERR_MSG)) {
-	    Tcl_DecrRefCount(options);
+	    /* Do not decrRefCount 'options', it was already done by
+	     * Tcl_ObjSetVar2 */
 	    return TCL_ERROR;
 	}
     }
-- 
cgit v0.12


From 4557297b08546a1763773f2faae9e3614d34d078 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 13 Dec 2012 15:59:51 +0000
Subject: 3595576 Tests/fix for mem corruption: [catch] fails to store options
 in a var.

---
 generic/tclCmdAH.c | 1 -
 tests/cmdAH.test   | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 8e32389..44f08a3 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -273,7 +273,6 @@ Tcl_CatchObjCmd(
 	Tcl_Obj *options = Tcl_GetReturnOptions(interp, result);
 	if (NULL == Tcl_ObjSetVar2(interp, optionVarNamePtr, NULL,
 		options, 0)) {
-	    Tcl_DecrRefCount(options);
 	    Tcl_ResetResult(interp);
 	    Tcl_AppendResult(interp,
 		    "couldn't save return options in variable", NULL);
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 2e94d7d..fb0fefc 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -46,6 +46,12 @@ test cmdAH-1.2 {Tcl_CatchObjCmd, errors} {
 test cmdAH-1.3 {Tcl_CatchObjCmd, errors} {
     list [catch {catch foo bar baz spaz} msg] $msg
 } {1 {wrong # args: should be "catch script ?resultVarName? ?optionVarName?"}}
+test cmdAH-1.4 {Bug 3595576} {
+    catch {catch {} -> noSuchNs::var}
+} 1
+test cmdAH-1.5 {Bug 3595576} {
+    catch {catch error -> noSuchNs::var}
+} 1
 
 test cmdAH-2.1 {Tcl_CdObjCmd} {
     list [catch {cd foo bar} msg] $msg
-- 
cgit v0.12


From 94ada5d31fad15023ae03d890aa734b130b8f386 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 13 Dec 2012 16:11:07 +0000
Subject: Restore clarity to macro test.

---
 generic/tcl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index bf9b446..9dd6ff0 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -833,7 +833,7 @@ int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
 #   define Tcl_DecrRefCount(objPtr) \
 	do { \
 	    Tcl_Obj *_objPtr = (objPtr); \
-	    if (_objPtr->refCount-- < 2) { \
+	    if (--(_objPtr)->refCount <= 0) { \
 		TclFreeObj(_objPtr); \
 	    } \
 	} while(0)
-- 
cgit v0.12


From 093fb49d43ccd695857584d78cab37848c0f362a Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 13 Dec 2012 19:43:43 +0000
Subject: Simplify the [info object] and [info class] additions.

---
 generic/tclOOInfo.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index e09ee4e..3f37a6d 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -114,21 +114,15 @@ TclOOInitInfo(
 
     infoCmd = Tcl_FindCommand(interp, "info", NULL, TCL_GLOBAL_ONLY);
     if (infoCmd != NULL && Tcl_IsEnsemble(infoCmd)) {
-	Tcl_Obj *mapDict, *objectObj, *classObj;
+	Tcl_Obj *mapDict;
 
 	Tcl_GetEnsembleMappingDict(NULL, infoCmd, &mapDict);
 	if (mapDict != NULL) {
-	    objectObj = Tcl_NewStringObj("object", -1);
-	    classObj = Tcl_NewStringObj("class", -1);
 
-	    Tcl_IncrRefCount(objectObj);
-	    Tcl_IncrRefCount(classObj);
-	    Tcl_DictObjPut(NULL, mapDict, objectObj,
+	    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("object", -1),
 		    Tcl_NewStringObj("::oo::InfoObject", -1));
-	    Tcl_DictObjPut(NULL, mapDict, classObj,
+	    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("class", -1),
 		    Tcl_NewStringObj("::oo::InfoClass", -1));
-	    Tcl_DecrRefCount(objectObj);
-	    Tcl_DecrRefCount(classObj);
 	    Tcl_SetEnsembleMappingDict(interp, infoCmd, mapDict);
 	}
     }
-- 
cgit v0.12


From 8890130ab8712a4f466800f5680b617525d9feba Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 13 Dec 2012 20:20:46 +0000
Subject: TIP 400 suffered from the same segfaulting flaw as 3595576.
 Segfaulting test and fix committed.

---
 generic/tclZlib.c | 19 +++----------------
 tests/zlib.test   | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 8fbe049..9c1176e 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -507,7 +507,7 @@ GenerateHeader(
  * ExtractHeader --
  *
  *	Take the values out of a gzip header and store them in a dictionary.
- *	SetValue is a helper function.
+ *	SetValue is a helper macro.
  *
  * Results:
  *	None.
@@ -518,18 +518,8 @@ GenerateHeader(
  *----------------------------------------------------------------------
  */
 
-static inline void
-SetValue(
-    Tcl_Obj *dictObj,
-    const char *key,
-    Tcl_Obj *value)
-{
-    Tcl_Obj *keyObj = Tcl_NewStringObj(key, -1);
-
-    Tcl_IncrRefCount(keyObj);
-    Tcl_DictObjPut(NULL, dictObj, keyObj, value);
-    TclDecrRefCount(keyObj);
-}
+#define SetValue(dictObj, key, value) \
+	Tcl_DictObjPut(NULL, (dictObj), Tcl_NewStringObj((key), -1), (value))
 
 static void
 ExtractHeader(
@@ -2119,9 +2109,6 @@ ZlibCmd(
 	}
 	if (headerVarObj != NULL && Tcl_ObjSetVar2(interp, headerVarObj, NULL,
 		headerDictObj, TCL_LEAVE_ERR_MSG) == NULL) {
-	    if (headerDictObj) {
-		TclDecrRefCount(headerDictObj);
-	    }
 	    return TCL_ERROR;
 	}
 	return TCL_OK;
diff --git a/tests/zlib.test b/tests/zlib.test
index 5f1e5fc..891dba0 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -826,6 +826,20 @@ test zlib-11.2 "Bug #3390073: mis-appled gzip filtering" -setup {
 } -cleanup {
     removeFile $file
 } -result {1000 /foo/bar 0}
+test zlib-11.3 {Bug 3595576 variant} -setup {
+    set file [makeFile {} test.input]
+} -constraints zlib -body {
+    set f [open $file wb]
+    puts -nonewline [zlib push gzip $f -header {filename /foo/bar}] \
+	[string repeat "hello" 1000]
+    close $f
+    set f [open $file rb]
+    set d [read $f]
+    close $f
+    zlib gunzip $d -header noSuchNs::foo
+} -cleanup {
+    removeFile $file
+} -returnCodes error -result {can't set "noSuchNs::foo": parent namespace doesn't exist}
 
 ::tcltest::cleanupTests
 return
-- 
cgit v0.12


From e00ad288cc9b6a7e9f95f74fd040d9ea8d21fe55 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Dec 2012 12:45:19 +0000
Subject: remove deprecated functions Tcl_VarEval and Tcl_VarEvalVA

---
 doc/AllowExc.3        |  3 +-
 doc/CrtInterp.3       |  4 +--
 doc/Eval.3            | 20 +------------
 generic/tcl.decls     | 16 ++++++-----
 generic/tclBasic.c    | 80 ---------------------------------------------------
 generic/tclDecls.h    | 16 ++++-------
 generic/tclIOCmd.c    | 14 +++++----
 generic/tclStubInit.c |  4 +--
 8 files changed, 30 insertions(+), 127 deletions(-)

diff --git a/doc/AllowExc.3 b/doc/AllowExc.3
index 0477c88..5a757ae 100644
--- a/doc/AllowExc.3
+++ b/doc/AllowExc.3
@@ -29,8 +29,7 @@ terminates with a completion code other than \fBTCL_OK\fR, \fBTCL_ERROR\fR
 or \fBTCL_RETURN\fR, then Tcl normally converts this into a \fBTCL_ERROR\fR
 return with an appropriate message.  The particular script
 evaluation procedures of Tcl that act in the manner are
-\fBTcl_EvalObjEx\fR, \fBTcl_EvalObjv\fR, \fBTcl_Eval\fR, \fBTcl_EvalEx\fR,
-\fBTcl_VarEval\fR and \fBTcl_VarEvalVA\fR. 
+\fBTcl_EvalObjEx\fR, \fBTcl_EvalObjv\fR, \fBTcl_Eval\fR, \fBTcl_EvalEx\fR. 
 .PP
 However, if \fBTcl_AllowExceptions\fR is invoked immediately before
 calling one of those a procedures, then arbitrary completion
diff --git a/doc/CrtInterp.3 b/doc/CrtInterp.3
index d8ee2cc..aac3a1d 100644
--- a/doc/CrtInterp.3
+++ b/doc/CrtInterp.3
@@ -107,7 +107,7 @@ uses.
 \fBInterpreter Creation And Deletion\fR
 .
 When a new interpreter is created and used in a call to \fBTcl_Eval\fR,
-\fBTcl_VarEval\fR, \fBTcl_SetVar\fR, or \fBTcl_GetVar\fR, a pair of calls
+\fBTcl_SetVar\fR, or \fBTcl_GetVar\fR, a pair of calls
 to \fBTcl_Preserve\fR and \fBTcl_Release\fR should be wrapped around all
 uses of the interpreter. Remember that it is unsafe to use the interpreter
 once \fBTcl_Release\fR has been called. To ensure that the interpreter is
@@ -120,7 +120,7 @@ code.
 .
 When an interpreter is retrieved from a data structure (e.g. the client
 data of a callback) for use in one of the evaluation functions
-(\fBTcl_Eval\fR, \fBTcl_VarEval\fR, \fBTcl_EvalObjv\fR etc.) or variable
+(\fBTcl_Eval\fR, \fBTcl_EvalObjv\fR etc.) or variable
 access functions (\fBTcl_SetVar\fR, \fBTcl_GetVar\fR, \fBTcl_SetVar2Ex\fR,
 etc.), a pair of calls to \fBTcl_Preserve\fR and \fBTcl_Release\fR should
 be wrapped around all uses of the interpreter; it is unsafe to reuse the
diff --git a/doc/Eval.3 b/doc/Eval.3
index f1c7c46..d060338 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -10,7 +10,7 @@
 .TH Tcl_Eval 3 8.1 Tcl "Tcl Library Procedures"
 .BS
 .SH NAME
-Tcl_EvalObjEx, Tcl_EvalObjv, Tcl_Eval, Tcl_EvalEx, Tcl_VarEval, Tcl_VarEvalVA \- execute Tcl scripts
+Tcl_EvalObjEx, Tcl_EvalObjv, Tcl_Eval, Tcl_EvalEx \- execute Tcl scripts
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -26,12 +26,6 @@ int
 .sp
 int
 \fBTcl_EvalEx\fR(\fIinterp, script, numBytes, flags\fR)
-.sp
-int
-\fBTcl_VarEval\fR(\fIinterp, part, part, ... \fB(char *) NULL\fR)
-.sp
-int
-\fBTcl_VarEvalVA\fR(\fIinterp, argList\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp **termPtr
 .AP Tcl_Interp *interp in
@@ -108,18 +102,6 @@ executed again, \fBTcl_Eval\fR may be faster than \fBTcl_EvalObjEx\fR.
 \fBTcl_EvalEx\fR is an extended version of \fBTcl_Eval\fR that takes
 additional arguments \fInumBytes\fR and \fIflags\fR.  \fBTcl_EvalEx\fR
 is generally preferred over \fBTcl_Eval\fR.
-.PP
-\fBTcl_VarEval\fR takes any number of string arguments
-of any length, concatenates them into a single string,
-then calls \fBTcl_Eval\fR to execute that string as a Tcl command.
-It returns the result of the command and also modifies
-\fIinterp->result\fR in the same way as \fBTcl_Eval\fR.
-The last argument to \fBTcl_VarEval\fR must be NULL to indicate the end
-of arguments.  \fBTcl_VarEval\fR is now deprecated.
-.PP
-\fBTcl_VarEvalVA\fR is the same as \fBTcl_VarEval\fR except that
-instead of taking a variable number of arguments it takes an argument
-list. Like \fBTcl_VarEval\fR, \fBTcl_VarEvalVA\fR is deprecated.
 
 .SH "FLAG BITS"
 .PP
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 76d5298..fe1d763 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -635,7 +635,7 @@ declare 176 {
     const char *Tcl_GetVar2(Tcl_Interp *interp, const char *part1,
 	    const char *part2, int flags)
 }
-# Removed in Tcl 9.0
+# Removed in 9.0
 #declare 177 {
 #    int Tcl_GlobalEval(Tcl_Interp *interp, const char *command)
 #}
@@ -923,9 +923,10 @@ declare 259 {
     int Tcl_UpVar2(Tcl_Interp *interp, const char *frameName, const char *part1,
 	    const char *part2, const char *localName, int flags)
 }
-declare 260 {
-    int Tcl_VarEval(Tcl_Interp *interp, ...)
-}
+# Removed in 9.0
+#declare 260 {
+#    int Tcl_VarEval(Tcl_Interp *interp, ...)
+#}
 declare 261 {
     ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, const char *varName,
 	    int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData)
@@ -983,9 +984,10 @@ declare 274 {
 declare 275 {
     void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
 }
-declare 276 {
-    int  Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList)
-}
+# Removed in 9.0
+#declare 276 {
+#    int  Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList)
+#}
 declare 277 {
     Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options)
 }
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 7202184..4f70cee 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -6357,86 +6357,6 @@ Tcl_AddObjErrorInfo(
 }
 
 /*
- *---------------------------------------------------------------------------
- *
- * Tcl_VarEvalVA --
- *
- *	Given a variable number of string arguments, concatenate them all
- *	together and execute the result as a Tcl command.
- *
- * Results:
- *	A standard Tcl return result. An error message or other result may be
- *	left in the interp's result.
- *
- * Side effects:
- *	Depends on what was done by the command.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_VarEvalVA(
-    Tcl_Interp *interp,		/* Interpreter in which to evaluate command */
-    va_list argList)		/* Variable argument list. */
-{
-    Tcl_DString buf;
-    char *string;
-    int result;
-
-    /*
-     * Copy the strings one after the other into a single larger string. Use
-     * stack-allocated space for small commands, but if the command gets too
-     * large than call ckalloc to create the space.
-     */
-
-    Tcl_DStringInit(&buf);
-    while (1) {
-	string = va_arg(argList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	Tcl_DStringAppend(&buf, string, -1);
-    }
-
-    result = Tcl_Eval(interp, Tcl_DStringValue(&buf));
-    Tcl_DStringFree(&buf);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VarEval --
- *
- *	Given a variable number of string arguments, concatenate them all
- *	together and execute the result as a Tcl command.
- *
- * Results:
- *	A standard Tcl return result. An error message or other result may be
- *	left in the interp.
- *
- * Side effects:
- *	Depends on what was done by the command.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-int
-Tcl_VarEval(
-    Tcl_Interp *interp,
-    ...)
-{
-    va_list argList;
-    int result;
-
-    va_start(argList, interp);
-    result = Tcl_VarEvalVA(interp, argList);
-    va_end(argList);
-
-    return result;
-}
-
-/*
  *----------------------------------------------------------------------
  *
  * Tcl_SetRecursionLimit --
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 5c206aa..0770e98 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -747,8 +747,7 @@ TCLAPI int		Tcl_UpVar(Tcl_Interp *interp, const char *frameName,
 TCLAPI int		Tcl_UpVar2(Tcl_Interp *interp, const char *frameName,
 				const char *part1, const char *part2,
 				const char *localName, int flags);
-/* 260 */
-TCLAPI int		Tcl_VarEval(Tcl_Interp *interp, ...);
+/* Slot 260 is reserved */
 /* 261 */
 TCLAPI ClientData	Tcl_VarTraceInfo(Tcl_Interp *interp,
 				const char *varName, int flags,
@@ -795,8 +794,7 @@ TCLAPI const char *	Tcl_PkgRequire(Tcl_Interp *interp, const char *name,
 /* 275 */
 TCLAPI void		Tcl_SetErrorCodeVA(Tcl_Interp *interp,
 				va_list argList);
-/* 276 */
-TCLAPI int		Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList);
+/* Slot 276 is reserved */
 /* 277 */
 TCLAPI Tcl_Pid		Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options);
 /* 278 */
@@ -2063,7 +2061,7 @@ typedef struct TclStubs {
     void (*tcl_UpdateLinkedVar) (Tcl_Interp *interp, const char *varName); /* 257 */
     int (*tcl_UpVar) (Tcl_Interp *interp, const char *frameName, const char *varName, const char *localName, int flags); /* 258 */
     int (*tcl_UpVar2) (Tcl_Interp *interp, const char *frameName, const char *part1, const char *part2, const char *localName, int flags); /* 259 */
-    int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
+    void (*reserved260)(void);
     ClientData (*tcl_VarTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 261 */
     ClientData (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 262 */
     int (*tcl_Write) (Tcl_Channel chan, const char *s, int slen); /* 263 */
@@ -2079,7 +2077,7 @@ typedef struct TclStubs {
     int (*tclPkgProvide) (Tcl_Interp *interp, const char *name, const char *version); /* 273 */
     const char * (*tcl_PkgRequire) (Tcl_Interp *interp, const char *name, const char *version, int exact); /* 274 */
     void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */
-    int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */
+    void (*reserved276)(void);
     Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */
     void (*tcl_PanicVA) (const char *format, va_list argList); /* 278 */
     void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */
@@ -2979,8 +2977,7 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_UpVar) /* 258 */
 #define Tcl_UpVar2 \
 	(tclStubsPtr->tcl_UpVar2) /* 259 */
-#define Tcl_VarEval \
-	(tclStubsPtr->tcl_VarEval) /* 260 */
+/* Slot 260 is reserved */
 #define Tcl_VarTraceInfo \
 	(tclStubsPtr->tcl_VarTraceInfo) /* 261 */
 #define Tcl_VarTraceInfo2 \
@@ -3011,8 +3008,7 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_PkgRequire) /* 274 */
 #define Tcl_SetErrorCodeVA \
 	(tclStubsPtr->tcl_SetErrorCodeVA) /* 275 */
-#define Tcl_VarEvalVA \
-	(tclStubsPtr->tcl_VarEvalVA) /* 276 */
+/* Slot 276 is reserved */
 #define Tcl_WaitPid \
 	(tclStubsPtr->tcl_WaitPid) /* 277 */
 #define Tcl_PanicVA \
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index f738b1a..27f156f 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1324,11 +1324,11 @@ AcceptCallbackProc(
 
     if (acceptCallbackPtr->interp != NULL) {
 	char portBuf[TCL_INTEGER_SPACE];
-	char *script = acceptCallbackPtr->script;
+	Tcl_Obj *script = Tcl_NewStringObj(acceptCallbackPtr->script, -1);
 	Tcl_Interp *interp = acceptCallbackPtr->interp;
 	int result;
 
-	Tcl_Preserve(script);
+	Tcl_IncrRefCount(script);
 	Tcl_Preserve(interp);
 
 	TclFormatInt(portBuf, port);
@@ -1341,8 +1341,12 @@ AcceptCallbackProc(
 
 	Tcl_RegisterChannel(NULL, chan);
 
-	result = Tcl_VarEval(interp, script, " ", Tcl_GetChannelName(chan),
-		" ", address, " ", portBuf, NULL);
+	result = Tcl_ListObjAppendElement(interp, script, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
+	if (result == TCL_OK) {
+	    Tcl_ListObjAppendElement(NULL, script, Tcl_NewStringObj(address, -1));
+	    Tcl_ListObjAppendElement(NULL, script, Tcl_NewStringObj(portBuf, -1));
+	    result = Tcl_EvalObjEx(interp, script, 0);
+	}
 	if (result != TCL_OK) {
 	    Tcl_BackgroundException(interp, result);
 	    Tcl_UnregisterChannel(interp, chan);
@@ -1356,7 +1360,7 @@ AcceptCallbackProc(
 	Tcl_UnregisterChannel(NULL, chan);
 
 	Tcl_Release(interp);
-	Tcl_Release(script);
+	Tcl_DecrRefCount(script);
     } else {
 	/*
 	 * The interpreter has been deleted, so there is no useful way to use
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 30c2b76..50fc6de 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -930,7 +930,7 @@ const TclStubs tclStubs = {
     Tcl_UpdateLinkedVar, /* 257 */
     Tcl_UpVar, /* 258 */
     Tcl_UpVar2, /* 259 */
-    Tcl_VarEval, /* 260 */
+    0, /* 260 */
     Tcl_VarTraceInfo, /* 261 */
     Tcl_VarTraceInfo2, /* 262 */
     Tcl_Write, /* 263 */
@@ -946,7 +946,7 @@ const TclStubs tclStubs = {
     TclPkgProvide, /* 273 */
     Tcl_PkgRequire, /* 274 */
     Tcl_SetErrorCodeVA, /* 275 */
-    Tcl_VarEvalVA, /* 276 */
+    0, /* 276 */
     Tcl_WaitPid, /* 277 */
     Tcl_PanicVA, /* 278 */
     Tcl_GetVersion, /* 279 */
-- 
cgit v0.12


From b13b1c602065dce05521c69866b973df90affb6b Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 17 Dec 2012 14:27:44 +0000
Subject: Slim down the code a bit more; we can make more safe assumptions.

---
 generic/tclOOInfo.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index 3f37a6d..5be9b01 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -100,6 +100,7 @@ TclOOInitInfo(
     Tcl_Interp *interp)
 {
     Tcl_Command infoCmd;
+    Tcl_Obj *mapDict;
 
     /*
      * Build the ensembles used to implement [info object] and [info class].
@@ -113,19 +114,12 @@ TclOOInitInfo(
      */
 
     infoCmd = Tcl_FindCommand(interp, "info", NULL, TCL_GLOBAL_ONLY);
-    if (infoCmd != NULL && Tcl_IsEnsemble(infoCmd)) {
-	Tcl_Obj *mapDict;
-
-	Tcl_GetEnsembleMappingDict(NULL, infoCmd, &mapDict);
-	if (mapDict != NULL) {
-
-	    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("object", -1),
-		    Tcl_NewStringObj("::oo::InfoObject", -1));
-	    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("class", -1),
-		    Tcl_NewStringObj("::oo::InfoClass", -1));
-	    Tcl_SetEnsembleMappingDict(interp, infoCmd, mapDict);
-	}
-    }
+    Tcl_GetEnsembleMappingDict(NULL, infoCmd, &mapDict);
+    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("object", -1),
+	    Tcl_NewStringObj("::oo::InfoObject", -1));
+    Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("class", -1),
+	    Tcl_NewStringObj("::oo::InfoClass", -1));
+    Tcl_SetEnsembleMappingDict(interp, infoCmd, mapDict);
 }
 
 /*
-- 
cgit v0.12


From 569360bf40839acdb1eefefb0cf1fbb8b7e33083 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 18 Dec 2012 09:37:42 +0000
Subject: Generate better code for the common case of subst-ed variables where
 the variable is a simple scalar or an array with a simple literal element
 name.

---
 generic/tclCompCmdsSZ.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 9c93fb2..71a1dfc 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -836,6 +836,21 @@ TclSubstCompile(
 	    TclEmitPush(literal, envPtr);
 	    count++;
 	    continue;
+	case TCL_TOKEN_VARIABLE:
+	    /*
+	     * Simple variable access; can only generate TCL_OK or TCL_ERROR
+	     * so no need to generate elaborate exception-management code.
+	     */
+
+	    if (tokenPtr->numComponents == 1 || (tokenPtr->numComponents == 2
+		    && tokenPtr[2].type == TCL_TOKEN_TEXT)) {
+		envPtr->line = bline;
+		TclCompileVarSubst(interp, tokenPtr, envPtr);
+		bline = envPtr->line;
+		count++;
+		continue;
+	    }
+	    break;
 	}
 
 	while (count > 255) {
-- 
cgit v0.12


From 81a67b9cf4d7fa11160de36419042e5f5812cc5c Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 18 Dec 2012 10:21:34 +0000
Subject: Better version that can handle simple composite array keys as well.
 As long as they are free of command substitutions, we can still safely omit
 the exception processor code.

---
 generic/tclCompCmdsSZ.c | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 71a1dfc..7bead0d 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -838,19 +838,32 @@ TclSubstCompile(
 	    continue;
 	case TCL_TOKEN_VARIABLE:
 	    /*
-	     * Simple variable access; can only generate TCL_OK or TCL_ERROR
-	     * so no need to generate elaborate exception-management code.
+	     * Check for simple variable access; see if we can only generate
+	     * TCL_OK or TCL_ERROR from the substituted variable read; if so,
+	     * there is no need to generate elaborate exception-management
+	     * code. Note that the first component of TCL_TOKEN_VARIABLE is
+	     * always TCL_TOKEN_TEXT...
 	     */
 
-	    if (tokenPtr->numComponents == 1 || (tokenPtr->numComponents == 2
-		    && tokenPtr[2].type == TCL_TOKEN_TEXT)) {
-		envPtr->line = bline;
-		TclCompileVarSubst(interp, tokenPtr, envPtr);
-		bline = envPtr->line;
-		count++;
-		continue;
+	    if (tokenPtr->numComponents > 1) {
+		int i, foundCommand = 0;
+
+		for (i=2 ; i<=tokenPtr->numComponents ; i++) {
+		    if (tokenPtr[i].type == TCL_TOKEN_COMMAND) {
+			foundCommand = 1;
+			break;
+		    }
+		}
+		if (foundCommand) {
+		    break;
+		}
 	    }
-	    break;
+
+	    envPtr->line = bline;
+	    TclCompileVarSubst(interp, tokenPtr, envPtr);
+	    bline = envPtr->line;
+	    count++;
+	    continue;
 	}
 
 	while (count > 255) {
-- 
cgit v0.12


From fac8f9d0ae0b5845ac81ae09a4cbec06964ec2a4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Dec 2012 08:16:50 +0000
Subject: Turn pkgb.so into a Tcl9 interoperability test library: Whatever Tcl9
 looks like, loading pkgb.so in Tcl 9 should either result in an
 error-message, either succeed, but never crash. Eliminate unnessarcy static
 HasStubSupport() and isDigit() functions, just do the same inline.

---
 ChangeLog            |  8 ++++++
 generic/tclStubLib.c | 33 +++++++----------------
 unix/dltest/pkgb.c   | 76 ++++++++++++++++++++++++++++------------------------
 3 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 092d5f9..204275f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-21  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* unix/dltest/pkgb.c:  Turn pkgb.so into a Tcl9 interoperability test
+    library: Whatever Tcl9 looks like, loading pkgb.so in Tcl 9 should
+    either result in an error-message, either succeed, but never crash.
+	* generic/tclStubLib.c: Eliminate unnessarcy static HasStubSupport() and
+	isDigit() functions, just do the same inline.
+
 2012-12-13  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h: Fix Tcl_DecrRefCount macro such that it
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index ceee8f3..7b62f5e 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -19,28 +19,11 @@ TclPlatStubs *tclPlatStubsPtr = NULL;
 TclIntStubs *tclIntStubsPtr = NULL;
 TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
 
-static TclStubs *
-HasStubSupport(interp)
-    Tcl_Interp *interp;
-{
-    Interp *iPtr = (Interp *) interp;
-
-    if (iPtr->stubTable && (iPtr->stubTable->magic == TCL_STUB_MAGIC)) {
-	return iPtr->stubTable;
-    }
-    interp->result = "interpreter uses an incompatible stubs mechanism";
-    interp->freeProc = TCL_STATIC;
-    return NULL;
-}
-
 /*
- * Use our own isdigit to avoid linking to libc on windows
+ * Use our own ISDIGIT to avoid linking to libc on windows
  */
 
-static int isDigit(const int c)
-{
-    return (c >= '0' && c <= '9');
-}
+#define ISDIGIT(c) (((unsigned)((c)-'0')) <= 9)
 
 /*
  *----------------------------------------------------------------------
@@ -66,9 +49,10 @@ Tcl_InitStubs(interp, version, exact)
     CONST char *version;
     int exact;
 {
+    Interp *iPtr = (Interp *) interp;
     CONST char *actualVersion = NULL;
     ClientData pkgData = NULL;
-    TclStubs *stubsPtr;
+    TclStubs *stubsPtr = iPtr->stubTable;
 
     /*
      * We can't optimize this check by caching tclStubsPtr because that
@@ -76,8 +60,9 @@ Tcl_InitStubs(interp, version, exact)
      * times. [Bug 615304]
      */
 
-    stubsPtr = HasStubSupport(interp);
-    if (!stubsPtr) {
+    if (!stubsPtr || (stubsPtr->magic != TCL_STUB_MAGIC)) {
+	iPtr->result = "interpreter uses an incompatible stubs mechanism";
+	iPtr->freeProc = TCL_STATIC;
 	return NULL;
     }
 
@@ -90,7 +75,7 @@ Tcl_InitStubs(interp, version, exact)
 	int count = 0;
 
 	while (*p) {
-	    count += !isDigit(*p++);
+	    count += !ISDIGIT(*p++);
 	}
 	if (count == 1) {
 	    CONST char *q = actualVersion;
@@ -99,7 +84,7 @@ Tcl_InitStubs(interp, version, exact)
 	    while (*p && (*p == *q)) {
 		p++; q++;
 	    }
-	    if (*p || isDigit(*q)) {
+	    if (*p || ISDIGIT(*q)) {
 		/* Construct error message */
 		stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
 		return NULL;
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index d7a7e5b..0bff98b 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -1,15 +1,16 @@
-/* 
+/*
  * pkgb.c --
  *
- *	This file contains a simple Tcl package "pkgb" that is intended
- *	for testing the Tcl dynamic loading facilities.	 It can be used
- *	in both safe and unsafe interpreters.
+ *	This file contains a simple Tcl package "pkgb" that is intended for
+ *	testing the Tcl dynamic loading facilities. It can be used in both
+ *	safe and unsafe interpreters.
  *
  * Copyright (c) 1995 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
+
 #include "tcl.h"
 
 /*
@@ -17,17 +18,17 @@
  */
 
 static int    Pkgb_SubObjCmd _ANSI_ARGS_((ClientData clientData,
-		Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]));
+		Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
 static int    Pkgb_UnsafeObjCmd _ANSI_ARGS_((ClientData clientData,
-		Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]));
+		Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
 
 /*
  *----------------------------------------------------------------------
  *
  * Pkgb_SubObjCmd --
  *
- *	This procedure is invoked to process the "pkgb_sub" Tcl command.
- *	It expects two arguments and returns their difference.
+ *	This procedure is invoked to process the "pkgb_sub" Tcl command. It
+ *	expects two arguments and returns their difference.
  *
  * Results:
  *	A standard Tcl result.
@@ -43,17 +44,17 @@ Pkgb_SubObjCmd(dummy, interp, objc, objv)
     ClientData dummy;		/* Not used. */
     Tcl_Interp *interp;		/* Current interpreter. */
     int objc;			/* Number of arguments. */
-    Tcl_Obj * CONST objv[];	/* Argument objects. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
     int first, second;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "num num");
-        return TCL_ERROR;
+	return TCL_ERROR;
     }
     if ((Tcl_GetIntFromObj(interp, objv[1], &first) != TCL_OK)
 	    || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) {
-        return TCL_ERROR;
+	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, Tcl_NewIntObj(first - second));
     return TCL_OK;
@@ -64,8 +65,8 @@ Pkgb_SubObjCmd(dummy, interp, objc, objv)
  *
  * Pkgb_UnsafeObjCmd --
  *
- *	This procedure is invoked to process the "pkgb_unsafe" Tcl command.
- *	It just returns a constant string.
+ *	This procedure is invoked to process the "pkgb_unsafe" Tcl command. It
+ *	just returns a constant string.
  *
  * Results:
  *	A standard Tcl result.
@@ -81,10 +82,9 @@ Pkgb_UnsafeObjCmd(dummy, interp, objc, objv)
     ClientData dummy;		/* Not used. */
     Tcl_Interp *interp;		/* Current interpreter. */
     int objc;			/* Number of arguments. */
-    Tcl_Obj * CONST objv[];	/* Argument objects. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
-    return TCL_OK;
+    return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
 }
 
 /*
@@ -92,8 +92,8 @@ Pkgb_UnsafeObjCmd(dummy, interp, objc, objv)
  *
  * Pkgb_Init --
  *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
+ *	This is a package initialization procedure, which is called by Tcl
+ *	when this package is to be added to an interpreter.
  *
  * Results:
  *	None.
@@ -104,17 +104,20 @@ Pkgb_UnsafeObjCmd(dummy, interp, objc, objv)
  *----------------------------------------------------------------------
  */
 
-int
+DLLEXPORT int
 Pkgb_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
+    Tcl_Interp *interp;		/* Interpreter in which the package is to be
+				 * made available. */
 {
     int code;
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
+	if (Tcl_InitStubs(interp, "8.4-", 0) == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_ResetResult(interp);
     }
-    code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
+    code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL);
     if (code != TCL_OK) {
 	return code;
     }
@@ -130,8 +133,8 @@ Pkgb_Init(interp)
  *
  * Pkgb_SafeInit --
  *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an unsafe interpreter.
+ *	This is a package initialization procedure, which is called by Tcl
+ *	when this package is to be added to a safe interpreter.
  *
  * Results:
  *	None.
@@ -142,19 +145,22 @@ Pkgb_Init(interp)
  *----------------------------------------------------------------------
  */
 
-int
+DLLEXPORT int
 Pkgb_SafeInit(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
+    Tcl_Interp *interp;		/* Interpreter in which the package is to be
+				 * made available. */
 {
     int code;
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
+	if (Tcl_InitStubs(interp, "8.4-", 0) == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_ResetResult(interp);
     }
-    code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
+    code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL);
     if (code != TCL_OK) {
-      return code;
+	return code;
     }
     Tcl_CreateObjCommand(interp, "pkgb_sub", Pkgb_SubObjCmd, (ClientData) 0,
 	    (Tcl_CmdDeleteProc *) NULL);
-- 
cgit v0.12


From ed156a09fa82ac8d6ffed202a727a06aa1b4bd66 Mon Sep 17 00:00:00 2001
From: ferrieux <ferrieux@users.sourceforge.net>
Date: Sat, 22 Dec 2012 19:05:34 +0000
Subject: Stop leaking allocated space when objifying a zero-length DString.
 [Bug 3598150] spotted by afredd.

---
 ChangeLog         |  5 +++++
 generic/tclUtil.c | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 336da37..49da827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-22  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
+
+	* generic/tclUtil.c: Stop leaking allocated space when objifying a
+	zero-length DString. [Bug 3598150] spotted by afredd.
+
 2012-12-21  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* unix/dltest/pkgb.c:  Inline compat Tcl_GetDefaultEncodingDir.
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 13e54ec..ddf067b 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -2927,14 +2927,16 @@ TclDStringToObj(
 {
     Tcl_Obj *result;
 
-    if (dsPtr->length == 0) {
-	TclNewObj(result);
-    } else if (dsPtr->string == dsPtr->staticSpace) {
-	/*
-	 * Static buffer, so must copy.
-	 */
-
-	TclNewStringObj(result, dsPtr->string, dsPtr->length);
+    if (dsPtr->string == dsPtr->staticSpace) {
+	if (dsPtr->length == 0) {
+	    TclNewObj(result);
+	} else {
+	    /*
+	     * Static buffer, so must copy.
+	     */
+	    
+	    TclNewStringObj(result, dsPtr->string, dsPtr->length);
+	}
     } else {
 	/*
 	 * Dynamic buffer, so transfer ownership and reset.
-- 
cgit v0.12


From e2e451e2e550c7bff922e4a3966c2b4c2b90d158 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sun, 23 Dec 2012 08:17:17 +0000
Subject: Change back to using an isDigit function. We simply don't need to
 make any (formally non-portable) assumptions about what happens when an
 unsigned zero is decremented, and the code isn't in a performance-critical
 area.

Remark by jan.nijtmans: The macro is perfectly portable! Not portable is the
exact result of the substraction ('\xB0' - '0' might give 0x80 on some platforms and 0xffffff80 on others), but comparing <= 9 always gives the correct result. We are only checking for digits here! The macro correctly inlines with any compiler, so it's better anyway.

Remark by dkf: But it's less clear. In this code, that's more important than a teeny bit of speed from inlining in a non-critical location.
---
 generic/tclStubLib.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index f61e0ca..859cbf9 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -24,10 +24,13 @@ const TclIntStubs *tclIntStubsPtr = NULL;
 const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
 
 /*
- * Use our own ISDIGIT to avoid linking to libc on windows
+ * Use our own isDigit to avoid linking to libc on windows
  */
 
-#define ISDIGIT(c) (((unsigned)((c)-'0')) <= 9)
+static int isDigit(const int c)
+{
+    return (c >= '0' && c <= '9');
+}
 
 /*
  *----------------------------------------------------------------------
@@ -79,7 +82,7 @@ Tcl_InitStubs(
 	int count = 0;
 
 	while (*p) {
-	    count += !ISDIGIT(*p++);
+	    count += !isDigit(*p++);
 	}
 	if (count == 1) {
 	    const char *q = actualVersion;
@@ -88,7 +91,7 @@ Tcl_InitStubs(
 	    while (*p && (*p == *q)) {
 		p++; q++;
 	    }
-	    if (*p || ISDIGIT(*q)) {
+	    if (*p || isDigit(*q)) {
 		/* Construct error message */
 		stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
 		return NULL;
-- 
cgit v0.12


From 4b67a9506ba46713d3d2c88962ec1efef7325576 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Dec 2012 09:55:45 +0000
Subject: eliminate dependancy of compat/*.h on tcl.h

---
 compat/dirent2.h |  10 ++---
 compat/dlfcn.h   |  19 ++++------
 compat/stdlib.h  |  51 +++++++++++--------------
 compat/string.h  |  74 +++++++++++++++---------------------
 compat/unistd.h  | 112 ++++++++++++++++++++++++++-----------------------------
 5 files changed, 115 insertions(+), 151 deletions(-)

diff --git a/compat/dirent2.h b/compat/dirent2.h
index c00d2f4..5be08ba 100644
--- a/compat/dirent2.h
+++ b/compat/dirent2.h
@@ -14,10 +14,6 @@
 #ifndef _DIRENT
 #define _DIRENT
 
-#ifndef _TCL
-#include <tcl.h>
-#endif
-
 /*
  * Dirent structure, which holds information about a single
  * directory entry.
@@ -50,8 +46,8 @@ typedef struct _dirdesc {
  * Procedures defined for reading directories:
  */
 
-extern void		closedir _ANSI_ARGS_((DIR *dirp));
-extern DIR *		opendir _ANSI_ARGS_((char *name));
-extern struct dirent *	readdir _ANSI_ARGS_((DIR *dirp));
+extern void		closedir (DIR *dirp);
+extern DIR *		opendir (char *name);
+extern struct dirent *	readdir (DIR *dirp);
 
 #endif /* _DIRENT */
diff --git a/compat/dlfcn.h b/compat/dlfcn.h
index 1a6a118..fb27ea0 100644
--- a/compat/dlfcn.h
+++ b/compat/dlfcn.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * dlfcn.h --
  *
  *	This file provides a replacement for the header file "dlfcn.h"
@@ -19,7 +19,6 @@
  */
 
 /*
- * @(#)dlfcn.h	1.4 revision of 95/04/25  09:36:52
  * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
  * 30159 Hannover, Germany
  */
@@ -27,10 +26,6 @@
 #ifndef __dlfcn_h__
 #define __dlfcn_h__
 
-#ifndef _TCL
-#include <tcl.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -47,14 +42,14 @@ extern "C" {
  * that contains functions to be called to initialize and terminate.
  */
 struct dl_info {
-	void (*init) _ANSI_ARGS_((void));
-	void (*fini) _ANSI_ARGS_((void));
+	void (*init) (void);
+	void (*fini) (void);
 };
 
-VOID *dlopen _ANSI_ARGS_((const char *path, int mode));
-VOID *dlsym _ANSI_ARGS_((void *handle, const char *symbol));
-char *dlerror _ANSI_ARGS_((void));
-int dlclose _ANSI_ARGS_((void *handle));
+void *dlopen (const char *path, int mode);
+void *dlsym (void *handle, const char *symbol);
+char *dlerror (void);
+int dlclose (void *handle);
 
 #ifdef __cplusplus
 }
diff --git a/compat/stdlib.h b/compat/stdlib.h
index 4d1a386..0ad4c1d 100644
--- a/compat/stdlib.h
+++ b/compat/stdlib.h
@@ -1,43 +1,36 @@
 /*
  * stdlib.h --
  *
- *	Declares facilities exported by the "stdlib" portion of
- *	the C library.  This file isn't complete in the ANSI-C
- *	sense;  it only declares things that are needed by Tcl.
- *	This file is needed even on many systems with their own
- *	stdlib.h (e.g. SunOS) because not all stdlib.h files
- *	declare all the procedures needed here (such as strtod).
+ *	Declares facilities exported by the "stdlib" portion of the C library.
+ *	This file isn't complete in the ANSI-C sense; it only declares things
+ *	that are needed by Tcl. This file is needed even on many systems with
+ *	their own stdlib.h (e.g. SunOS) because not all stdlib.h files declare
+ *	all the procedures needed here (such as strtod).
  *
  * Copyright (c) 1991 The Regents of the University of California.
  * Copyright (c) 1994-1998 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #ifndef _STDLIB
 #define _STDLIB
 
-#include <tcl.h>
-
-extern void		abort _ANSI_ARGS_((void));
-extern double		atof _ANSI_ARGS_((CONST char *string));
-extern int		atoi _ANSI_ARGS_((CONST char *string));
-extern long		atol _ANSI_ARGS_((CONST char *string));
-extern char *		calloc _ANSI_ARGS_((unsigned int numElements,
-			    unsigned int size));
-extern void		exit _ANSI_ARGS_((int status));
-extern int		free _ANSI_ARGS_((char *blockPtr));
-extern char *		getenv _ANSI_ARGS_((CONST char *name));
-extern char *		malloc _ANSI_ARGS_((unsigned int numBytes));
-extern void		qsort _ANSI_ARGS_((VOID *base, int n, int size,
-			    int (*compar)(CONST VOID *element1, CONST VOID
-			    *element2)));
-extern char *		realloc _ANSI_ARGS_((char *ptr, unsigned int numBytes));
-extern double		strtod _ANSI_ARGS_((CONST char *string, char **endPtr));
-extern long		strtol _ANSI_ARGS_((CONST char *string, char **endPtr,
-			    int base));
-extern unsigned long	strtoul _ANSI_ARGS_((CONST char *string,
-			    char **endPtr, int base));
+extern void		abort(void);
+extern double		atof(const char *string);
+extern int		atoi(const char *string);
+extern long		atol(const char *string);
+extern char *		calloc(unsigned int numElements, unsigned int size);
+extern void		exit(int status);
+extern int		free(char *blockPtr);
+extern char *		getenv(const char *name);
+extern char *		malloc(unsigned int numBytes);
+extern void		qsort(void *base, int n, int size, int (*compar)(
+			    const void *element1, const void *element2));
+extern char *		realloc(char *ptr, unsigned int numBytes);
+extern double		strtod(const char *string, char **endPtr);
+extern long		strtol(const char *string, char **endPtr, int base);
+extern unsigned long	strtoul(const char *string, char **endPtr, int base);
 
 #endif /* _STDLIB */
diff --git a/compat/string.h b/compat/string.h
index 4eb2b86..42be10c 100644
--- a/compat/string.h
+++ b/compat/string.h
@@ -6,66 +6,52 @@
  * Copyright (c) 1991-1993 The Regents of the University of California.
  * Copyright (c) 1994-1996 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #ifndef _STRING
 #define _STRING
 
-#include <tcl.h>
-
 /*
- * The following #include is needed to define size_t. (This used to
- * include sys/stdtypes.h but that doesn't exist on older versions
- * of SunOS, e.g. 4.0.2, so I'm trying sys/types.h now.... hopefully
- * it exists everywhere)
+ * The following #include is needed to define size_t. (This used to include
+ * sys/stdtypes.h but that doesn't exist on older versions of SunOS, e.g.
+ * 4.0.2, so I'm trying sys/types.h now.... hopefully it exists everywhere)
  */
 
 #include <sys/types.h>
 
 #ifdef __APPLE__
-extern VOID *		memchr _ANSI_ARGS_((CONST VOID *s, int c, size_t n));
+extern void *		memchr(const void *s, int c, size_t n);
 #else
-extern char *		memchr _ANSI_ARGS_((CONST VOID *s, int c, size_t n));
+extern char *		memchr(const void *s, int c, size_t n);
 #endif
-extern int		memcmp _ANSI_ARGS_((CONST VOID *s1, CONST VOID *s2,
-			    size_t n));
-extern char *		memcpy _ANSI_ARGS_((VOID *t, CONST VOID *f, size_t n));
+extern int		memcmp(const void *s1, const void *s2, size_t n);
+extern char *		memcpy(void *t, const void *f, size_t n);
 #ifdef NO_MEMMOVE
-#define memmove(d, s, n) bcopy ((s), (d), (n))
+#define memmove(d,s,n)	(bcopy((s), (d), (n)))
 #else
-extern char *		memmove _ANSI_ARGS_((VOID *t, CONST VOID *f,
-			    size_t n));
+extern char *		memmove(void *t, const void *f, size_t n);
 #endif
-extern char *		memset _ANSI_ARGS_((VOID *s, int c, size_t n));
+extern char *		memset(void *s, int c, size_t n);
 
-extern int		strcasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2));
-extern char *		strcat _ANSI_ARGS_((char *dst, CONST char *src));
-extern char *		strchr _ANSI_ARGS_((CONST char *string, int c));
-extern int		strcmp _ANSI_ARGS_((CONST char *s1, CONST char *s2));
-extern char *		strcpy _ANSI_ARGS_((char *dst, CONST char *src));
-extern size_t		strcspn _ANSI_ARGS_((CONST char *string,
-			    CONST char *chars));
-extern char *		strdup _ANSI_ARGS_((CONST char *string));
-extern char *		strerror _ANSI_ARGS_((int error));
-extern size_t		strlen _ANSI_ARGS_((CONST char *string));
-extern int		strncasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2, size_t n));
-extern char *		strncat _ANSI_ARGS_((char *dst, CONST char *src,
-			    size_t numChars));
-extern int		strncmp _ANSI_ARGS_((CONST char *s1, CONST char *s2,
-			    size_t nChars));
-extern char *		strncpy _ANSI_ARGS_((char *dst, CONST char *src,
-			    size_t numChars));
-extern char *		strpbrk _ANSI_ARGS_((CONST char *string,
-			    CONST char *chars));
-extern char *		strrchr _ANSI_ARGS_((CONST char *string, int c));
-extern size_t		strspn _ANSI_ARGS_((CONST char *string,
-			    CONST char *chars));
-extern char *		strstr _ANSI_ARGS_((CONST char *string,
-			    CONST char *substring));
-extern char *		strtok _ANSI_ARGS_((char *s, CONST char *delim));
+extern int		strcasecmp(const char *s1, const char *s2);
+extern char *		strcat(char *dst, const char *src);
+extern char *		strchr(const char *string, int c);
+extern int		strcmp(const char *s1, const char *s2);
+extern char *		strcpy(char *dst, const char *src);
+extern size_t		strcspn(const char *string, const char *chars);
+extern char *		strdup(const char *string);
+extern char *		strerror(int error);
+extern size_t		strlen(const char *string);
+extern int		strncasecmp(const char *s1, const char *s2, size_t n);
+extern char *		strncat(char *dst, const char *src, size_t numChars);
+extern int		strncmp(const char *s1, const char *s2, size_t nChars);
+extern char *		strncpy(char *dst, const char *src, size_t numChars);
+extern char *		strpbrk(const char *string, const char *chars);
+extern char *		strrchr(const char *string, int c);
+extern size_t		strspn(const char *string, const char *chars);
+extern char *		strstr(const char *string, const char *substring);
+extern char *		strtok(char *s, const char *delim);
 
 #endif /* _STRING */
diff --git a/compat/unistd.h b/compat/unistd.h
index 1a40e90..2de5bd0 100644
--- a/compat/unistd.h
+++ b/compat/unistd.h
@@ -1,82 +1,76 @@
 /*
  * unistd.h --
  *
- *      Macros, CONSTants and prototypes for Posix conformance.
+ *      Macros, constants and prototypes for Posix conformance.
  *
- * Copyright 1989 Regents of the University of California
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
+ * Copyright 1989 Regents of the University of California Permission to use,
+ * copy, modify, and distribute this software and its documentation for any
+ * purpose and without fee is hereby granted, provided that the above
+ * copyright notice appear in all copies. The University of California makes
+ * no representations about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
  */
 
 #ifndef _UNISTD
 #define _UNISTD
 
 #include <sys/types.h>
-#ifndef _TCL
-#   include "tcl.h"
-#endif
 
 #ifndef NULL
 #define NULL    0
 #endif
 
 /* 
- * Strict POSIX stuff goes here.  Extensions go down below, in the 
- * ifndef _POSIX_SOURCE section.
+ * Strict POSIX stuff goes here. Extensions go down below, in the ifndef
+ * _POSIX_SOURCE section.
  */
 
-extern void _exit _ANSI_ARGS_((int status));
-extern int access _ANSI_ARGS_((CONST char *path, int mode));
-extern int chdir _ANSI_ARGS_((CONST char *path));
-extern int chown _ANSI_ARGS_((CONST char *path, uid_t owner, gid_t group));
-extern int close _ANSI_ARGS_((int fd));
-extern int dup _ANSI_ARGS_((int oldfd));
-extern int dup2 _ANSI_ARGS_((int oldfd, int newfd));
-extern int execl _ANSI_ARGS_((CONST char *path, ...));
-extern int execle _ANSI_ARGS_((CONST char *path, ...));
-extern int execlp _ANSI_ARGS_((CONST char *file, ...));
-extern int execv _ANSI_ARGS_((CONST char *path, char **argv));
-extern int execve _ANSI_ARGS_((CONST char *path, char **argv, char **envp));
-extern int execvp _ANSI_ARGS_((CONST char *file, char **argv));
-extern pid_t fork _ANSI_ARGS_((void));
-extern char *getcwd _ANSI_ARGS_((char *buf, size_t size));
-extern gid_t getegid _ANSI_ARGS_((void));
-extern uid_t geteuid _ANSI_ARGS_((void));
-extern gid_t getgid _ANSI_ARGS_((void));
-extern int getgroups _ANSI_ARGS_((int bufSize, int *buffer));
-extern pid_t getpid _ANSI_ARGS_((void));
-extern uid_t getuid _ANSI_ARGS_((void));
-extern int isatty _ANSI_ARGS_((int fd));
-extern long lseek _ANSI_ARGS_((int fd, long offset, int whence));
-extern int pipe _ANSI_ARGS_((int *fildes));
-extern int read _ANSI_ARGS_((int fd, char *buf, size_t size));
-extern int setgid _ANSI_ARGS_((gid_t group));
-extern int setuid _ANSI_ARGS_((uid_t user));
-extern unsigned sleep _ANSI_ARGS_ ((unsigned seconds));
-extern char *ttyname _ANSI_ARGS_((int fd));
-extern int unlink _ANSI_ARGS_((CONST char *path));
-extern int write _ANSI_ARGS_((int fd, CONST char *buf, size_t size));
+extern void		_exit(int status);
+extern int		access(const char *path, int mode);
+extern int		chdir(const char *path);
+extern int		chown(const char *path, uid_t owner, gid_t group);
+extern int		close(int fd);
+extern int		dup(int oldfd);
+extern int		dup2(int oldfd, int newfd);
+extern int		execl(const char *path, ...);
+extern int		execle(const char *path, ...);
+extern int		execlp(const char *file, ...);
+extern int		execv(const char *path, char **argv);
+extern int		execve(const char *path, char **argv, char **envp);
+extern int		execvpw(const char *file, char **argv);
+extern pid_t		fork(void);
+extern char *		getcwd(char *buf, size_t size);
+extern gid_t		getegid(void);
+extern uid_t		geteuid(void);
+extern gid_t		getgid(void);
+extern int		getgroups(int bufSize, int *buffer);
+extern pid_t		getpid(void);
+extern uid_t		getuid(void);
+extern int		isatty(int fd);
+extern long		lseek(int fd, long offset, int whence);
+extern int		pipe(int *fildes);
+extern int		read(int fd, char *buf, size_t size);
+extern int		setgid(gid_t group);
+extern int		setuid(uid_t user);
+extern unsigned		sleep(unsigned seconds);
+extern char *		ttyname(int fd);
+extern int		unlink(const char *path);
+extern int		write(int fd, const char *buf, size_t size);
 
 #ifndef	_POSIX_SOURCE
-extern char *crypt _ANSI_ARGS_((CONST char *, CONST char *));
-extern int fchown _ANSI_ARGS_((int fd, uid_t owner, gid_t group));
-extern int flock _ANSI_ARGS_((int fd, int operation));
-extern int ftruncate _ANSI_ARGS_((int fd, unsigned long length));
-extern int ioctl _ANSI_ARGS_((int fd, int request, ...));
-extern int readlink _ANSI_ARGS_((CONST char *path, char *buf, int bufsize));
-extern int setegid _ANSI_ARGS_((gid_t group));
-extern int seteuid _ANSI_ARGS_((uid_t user));
-extern int setreuid _ANSI_ARGS_((int ruid, int euid));
-extern int symlink _ANSI_ARGS_((CONST char *, CONST char *));
-extern int ttyslot _ANSI_ARGS_((void));
-extern int truncate _ANSI_ARGS_((CONST char *path, unsigned long length));
-extern int vfork _ANSI_ARGS_((void));
+extern char *		crypt(const char *, const char *);
+extern int		fchown(int fd, uid_t owner, gid_t group);
+extern int		flock(int fd, int operation);
+extern int		ftruncate(int fd, unsigned long length);
+extern int		ioctl(int fd, int request, ...);
+extern int		readlink(const char *path, char *buf, int bufsize);
+extern int		setegid(gid_t group);
+extern int		seteuidw(uid_t user);
+extern int		setreuid(int ruid, int euid);
+extern int		symlink(const char *, const char *);
+extern int		ttyslot(void);
+extern int		truncate(const char *path, unsigned long length);
+extern int		vfork(void);
 #endif /* _POSIX_SOURCE */
 
 #endif /* _UNISTD */
-
-- 
cgit v0.12


From 66c29096944ef5a69468c0fd188382deadcb0e03 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Dec 2012 14:41:15 +0000
Subject: [Bug 3598580]: Tcl_ListObjReplace may release deleted elements too
 early

Tests!?  Where are the tests!?!

They are in test listobj-11.1
---
 ChangeLog            | 5 +++++
 generic/tclListObj.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 204275f..728b677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-27  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclListObj.c: [Bug 3598580]: Tcl_ListObjReplace may release
+	deleted elements too early
+
 2012-12-21  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* unix/dltest/pkgb.c:  Turn pkgb.so into a Tcl9 interoperability test
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index fffe6a2..b4af98a 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -655,6 +655,10 @@ Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv)
 	count = 0;
     }
     
+    for (i = 0;  i < objc;  i++) {
+	Tcl_IncrRefCount(objv[i]);
+    }
+
     numRequired = (numElems - count + objc);
     if (numRequired <= listRepPtr->maxElemCount) {
 	/*
@@ -689,7 +693,6 @@ Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv)
 
 	for (i = 0, j = first;  i < objc;  i++, j++) {
             elemPtrs[j] = objv[i];
-            Tcl_IncrRefCount(objv[i]);
         }
 
 	/*
@@ -745,7 +748,6 @@ Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv)
 
 	for (i = 0, j = first;  i < objc;  i++, j++) {
 	    newPtrs[j] = objv[i];
-	    Tcl_IncrRefCount(objv[i]);
 	}
 
 	listRepPtr->elemCount = numRequired;
-- 
cgit v0.12


From bf14f11c637d99ef6bea288be84e26f551de5693 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Dec 2012 20:54:31 +0000
Subject: restore old refcounts in TCL_ERROR case.

---
 generic/tclListObj.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 1166759..97e7152 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -906,6 +906,9 @@ Tcl_ListObjReplace(
 
 	listRepPtr = AttemptNewList(interp, newMax, NULL);
 	if (listRepPtr == NULL) {
+	    for (i = 0;  i < objc;  i++) {
+		objv[i]->refCount--;
+	    }
 	    return TCL_ERROR;
 	}
 
-- 
cgit v0.12


From 8751239349e355c4983ba5b7fe1696515ab41711 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Dec 2012 00:06:42 +0000
Subject: For Tcl9, do a real Tcl_DecrRefCount

---
 generic/tclListObj.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 97e7152..5b73a155 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -907,7 +907,11 @@ Tcl_ListObjReplace(
 	listRepPtr = AttemptNewList(interp, newMax, NULL);
 	if (listRepPtr == NULL) {
 	    for (i = 0;  i < objc;  i++) {
+#if TCL_MAJOR_VERSION > 8
+		Tcl_DecrRefCount(objv[i]);
+#else
 		objv[i]->refCount--;
+#endif
 	    }
 	    return TCL_ERROR;
 	}
-- 
cgit v0.12


From 0dc45b9fe32757b2732fb96074bc20110b636a0d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Dec 2012 15:24:24 +0000
Subject: fix tm.tcl to include tcl8 locations, and fix corresponding
 test-cases

---
 library/tm.tcl | 1 -
 tests/tm.test  | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/tm.tcl b/library/tm.tcl
index 4288658..2eff644 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -342,7 +342,6 @@ proc ::tcl::tm::Defaults {} {
 	    }
 	}
     }
-    }
     return
 }
 
diff --git a/tests/tm.test b/tests/tm.test
index 73e8261..42352e9 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -202,6 +202,11 @@ proc genpaths {base} {
     set base [file normalize $base]
     foreach {major minor} [split [info tclversion] .] break
     set results {}
+    set base8 [file join $base tcl8]
+    lappend results [file join $base8 site-tcl]
+    for {set i 0} {$i <= 7} {incr i} {
+	lappend results [file join $base8 8.$i]
+    }
     set base [file join $base tcl$major]
     lappend results [file join $base site-tcl]
     for {set i 0} {$i <= $minor} {incr i} {
-- 
cgit v0.12


From aef36bf11d4ad79a6f2e6691f132fd4c444822df Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Dec 2012 18:12:45 +0000
Subject: two more places where refCount was assumed to be a signed value. In
 Tcl9 that will probably be not true any more.

---
 generic/tclObj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 03141e4..7841bcf 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3784,7 +3784,7 @@ Tcl_DbDecrRefCount(
 	 * If the Tcl_Obj is going to be deleted, remove the entry.
 	 */
 
-	if ((objPtr->refCount - 1) <= 0) {
+	if (objPtr->refCount < 2) {
 	    ObjData *objData = Tcl_GetHashValue(hPtr);
 
 	    if (objData != NULL) {
@@ -3797,7 +3797,7 @@ Tcl_DbDecrRefCount(
 # endif /* TCL_THREADS */
 #endif /* TCL_MEM_DEBUG */
 
-    if (--(objPtr)->refCount <= 0) {
+    if ((objPtr)->refCount-- < 2) {
 	TclFreeObj(objPtr);
     }
 }
-- 
cgit v0.12